afterstep: cross-compile

While we're at it, move "*-config" and "*-libs" to "-devel" package.
This commit is contained in:
Đoàn Trần Công Danh 2020-07-30 12:56:53 +07:00
parent 78a5405aa9
commit e6fd8ae225
4 changed files with 71 additions and 3 deletions

View File

@ -0,0 +1,18 @@
diff --git libAfterBase/configure.in libAfterBase/configure.in
index 4bc2232..f250692 100644
--- libAfterBase/configure.in
+++ libAfterBase/configure.in
@@ -228,12 +228,7 @@ if test "x$enable_xlocale" = "xyes"; then
fi
dnl# Check for safe min/max - there still are some retarded compilers out there :
-AC_MSG_CHECKING(if we can use sign safe min/max macros)
-AC_TRY_RUN([#define MIN(x,y) \
- ({ const typeof(x) _x = (x); const typeof(y) _y = (y); (void) (&_x == &_y); \
- _x < _y ? _x : _y; })
- int main(){return MIN(0,1);}],
- [AC_DEFINE(USE_SAFE_MINMAX,1,will use type-safe min/max macros) AC_MSG_RESULT(yes)],AC_MSG_RESULT(no))
+AC_DEFINE(USE_SAFE_MINMAX,1,will use type-safe min/max macros)
dnl# Translate enable_* from "yes/no" to "1/0" (for configure.h)

View File

@ -0,0 +1,13 @@
diff --git configure configure
index bc9a30e..95e7b3a 100755
--- configure
+++ configure
@@ -6254,6 +6254,8 @@ FROM_AFTERSTEP_CONFIGURE=yes
export FROM_AFTERSTEP_CONFIGURE
_def_lib_conf_opts=" \
+ --build=${build_alias} \
+ --host=${host_alias} \
--prefix=${prefix} \
--exec-prefix=${exec_prefix} \
--bindir=${bindir} \

View File

@ -0,0 +1,30 @@
diff --git libAfterImage/configure.in libAfterImage/configure.in
index ca49a50..780e0ff 100644
--- libAfterImage/configure.in
+++ libAfterImage/configure.in
@@ -590,21 +590,21 @@ else
)
if test "x$have_ft2build" = "xno" ; then
if test "x$have_freetype_freetype" = "xyes" ; then
- AC_TRY_RUN([#include <freetype/freetype.h>
+ AC_TRY_COMPILE([#include <freetype/freetype.h>
int main(){FT_Face f; return 0;}],
[have_ttf=yes],AC_MSG_RESULT(no))
elif test "x$have_freetype" = "xyes" ; then
- AC_TRY_RUN([#include <freetype.h>
+ AC_TRY_COMPILE([#include <freetype.h>
int main(){FT_Face f; return 0;}],
[have_ttf=yes],AC_MSG_RESULT(no))
fi;
elif test "x$have_freetype_freetype" = "xyes" ; then
- AC_TRY_RUN([#include <ft2build.h>
+ AC_TRY_COMPILE([#include <ft2build.h>
#include <freetype/freetype.h>
int main(){FT_Face f; return 0;}],
[have_ttf=yes],AC_MSG_RESULT(no))
elif test "x$have_freetype" = "xyes" ; then
- AC_TRY_RUN([#include <ft2build.h>
+ AC_TRY_COMPILE([#include <ft2build.h>
#include <freetype.h>
int main(){FT_Face f; return 0;}],
[have_ttf=yes],AC_MSG_RESULT(no))

View File

@ -1,11 +1,11 @@
# Template file for 'afterstep'
pkgname=afterstep
version=2.2.12
revision=1
revision=2
wrksrc="${pkgname}-devel-${version}"
build_style=gnu-configure
configure_args="ac_cv_header_elf_h=no"
hostmakedepends="pkg-config"
hostmakedepends="pkg-config automake libtool"
makedepends="fltk-devel gtk+-devel"
short_desc="Window Manager based on the look and feel of the NeXTStep interface"
maintainer="Orphaned <orphan@voidlinux.org>"
@ -14,6 +14,11 @@ homepage="http://www.afterstep.org/"
distfiles="https://github.com/sashavasko/${pkgname}-devel/archive/${version}.tar.gz"
checksum=7a82d06a9ce432ef3b0856ff39f6da416aa8cbc249dbb2ff3c1cdcb02e2ca46d
pre_configure() {
autoreconf -fi libAfterBase
autoreconf -fi libAfterImage
}
post_install() {
vlicense COPYRIGHT
}
@ -22,8 +27,10 @@ afterstep-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove "usr/bin/*-config"
vmove "usr/bin/*-libs"
vmove usr/include
vmove usr/lib/*.a
vmove "usr/lib/*.a"
vmove usr/share/man/man3
}
}