diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:42:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:42:26 +0200 |
| commit | cbdfc3b84ec5a246b83fb991fd865754b841f9c5 (patch) | |
| tree | 19c96c6cd337984249264b43d548100260a3e857 | |
| parent | 36b8021619c7f7a8ec6fee10e3bfa6e7ff8d9d48 (diff) | |
| parent | ba1dbc96f36abce072ac39a33bb0bd85e12a4e97 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
39 files changed, 435 insertions, 514 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk new file mode 100644 index 000000000..072254087 --- /dev/null +++ b/mk/host-bottom.mk @@ -0,0 +1,77 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +host-extract: ${_HOST_PATCH_COOKIE} + +host-configure: +${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} + #@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ + #tsort | while read f; do \ + # cd ${WRKSRC}; \ + # case $$f in \ + # /*) \ + # find . -name "$${f#/}" -print | while read i; do \ + # touch "$$i"; \ + # done;; \ + # *) \ + # if test -e "$$f" ; then \ + # touch "$$f"; \ + # fi;; \ + # esac; \ + #done + @mkdir -p ${WRKBUILD} + @$(CMD_TRACE) "configuring... " + @cd ${WRKBUILD}; \ + for i in $$(find . -name config.sub);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.sub $$i; \ + fi; \ + done; \ + for i in $$(find . -name config.guess);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.guess $$i; \ + fi; \ + done; + cd ${WRKBUILD}; rm -f config.{cache,status}; \ + env ${HOST_CONFIGURE_ENV} \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ + --program-prefix= \ + --program-suffix= \ + --prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --libexecdir=/usr/libexec \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --disable-dependency-tracking \ + --disable-libtool-lock \ + --disable-nls \ + ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) + touch $@ + +host-build: +${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} + @$(CMD_TRACE) "compiling... " + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) + touch $@ + +hpkg-install: ${ALL_HOSTINST} +host-install: +${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) + env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) + rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} + exec ${MAKE} host-extract $(MAKE_TRACE) + touch $@ + +${_HOST_COOKIE}: + exec ${MAKE} hostpackage + +hostpackage: ${ALL_HOSTDIRS} + touch ${_HOST_COOKIE} + diff --git a/mk/host.mk b/mk/host.mk new file mode 100644 index 000000000..f9326da17 --- /dev/null +++ b/mk/host.mk @@ -0,0 +1,56 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +HOST_CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ + CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ + CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ + CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \ + LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})' + +# this is environment for 'make all' and 'make install' +HOST_MAKE_ENV?= +# this is arguments for 'make all' and 'make install' +HOST_XAKE_FLAGS?= +# this is arguments for 'make all' ONLY +HOST_MAKE_FLAGS?= +# this is arguments for 'make install' ONLY +HOST_FAKE_FLAGS?= +HOST_ALL_TARGET?= all +HOST_INSTALL_TARGET?= install + +HOST_MAKE_FLAGS+= ${HOST_XAKE_FLAGS} V=1 +HOST_FAKE_FLAGS+= ${HOST_XAKE_FLAGS} + +HOST_WRKINST= ${WRKDIR}/host + +_HOST_EXTRACT_COOKIE= ${WRKDIST}/.extract_done +_HOST_PATCH_COOKIE= ${WRKDIST}/.prepared +_HOST_CONFIGURE_COOKIE= ${WRKBUILD}/.host_configure_done +_HOST_BUILD_COOKIE= ${WRKBUILD}/.host_build_done +_HOST_FAKE_COOKIE= ${HOST_WRKINST}/.host_fake_done +_HOST_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}-host + +hostextract: ${_HOST_EXTRACT_COOKIE} +hostpatch: ${_HOST_PATCH_COOKIE} +hostconfigure: ${_HOST_CONFIGURE_COOKIE} +hostbuild: ${_HOST_BUILD_COOKIE} +hostfake: ${_HOST_FAKE_COOKIE} + +# there are some parameters to the HOST_template function +# 1.) Config.in identifier ADK_PACKAGE_$(1) +# 2.) name of the package, for single package mostly $(PKG_NAME) +# 3.) package version (upstream version) and package release (adk version), +# always $(PKG_VERSION)-$(PKG_RELEASE) + +define HOST_template +ALL_PKGOPTS+= $(1) +PKGNAME_$(1)= $(2) +HOSTDIR_$(1)= $(WRKDIR)/host +ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) +ALL_HOSTDIRS+= $${HOSTDIR_$(1)} +ALL_HOSTINST+= $(2)-hostinstall +endif + +$$(HOSTDIR_$(1)): ${_HOST_PATCH_COOKIE} ${_HOST_FAKE_COOKIE} + +endef diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index a3b42f915..f0af93810 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -17,7 +17,7 @@ PKG_LIBNAME?= $(PKG_NAME) pre-configure: do-configure: post-configure: -${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +${_CONFIGURE_COOKIE}: ${_HOST_COOKIE} ${_PATCH_COOKIE} @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ tsort | while read f; do \ cd ${WRKSRC}; \ @@ -169,15 +169,15 @@ ifeq (,$(filter noremove,${PKG_OPTS})) endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' ifneq (,$(filter dev,${PKG_OPTS})) - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + @test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ find . -name \*.h | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + @test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ find . -name \*.pc | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - for a in ${WRKINST}/usr/bin/*-config*; do \ + @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 9a8d4420a..694c6b0b1 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib -PKG_VERSION:= 8.0.5 -PKG_RELEASE:= 3 -PKG_MD5SUM:= cda5d101f43b8784fa60bdeaca4056f2 -PKG_DESCR:= MESA library +PKG_VERSION:= 9.2.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= df801a975045150790e10e2ccf32193f +PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm @@ -40,28 +40,13 @@ CONFIGURE_ARGS+= --disable-static \ --disable-gles1 \ --disable-gles2 \ --with-dri-drivers=${DRI_DRIVERS},swrast -CONFIGURE_ENV+= PYTHON2=/usr/bin/python +CONFIGURE_ENV+= PYTHON2=/usr/bin/python MISSING="echo" -XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile +XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} ifeq ($(ADK_NATIVE),y) XAKE_FLAGS+= RANLIB=ranlib AR=ar endif -post-extract: - (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - ./configure \ - --disable-static \ - --disable-gallium-llvm \ - --with-gallium-drivers=swrast \ - --with-driver=xlib \ - ); - ${MAKE} -C ${WRKBUILD}/src/glsl - ${CP} ${WRKBUILD}/src/glsl/glsl_compiler \ - ${STAGING_HOST_DIR}/bin/glsl_compiler - ${CP} ${WRKBUILD}/src/glsl/builtin_compiler \ - ${STAGING_HOST_DIR}/bin/builtin_compiler - ${MAKE} -C ${WRKBUILD}/src/glsl clean - mesalib-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib deleted file mode 100644 index a361c1105..000000000 --- a/package/MesaLib/patches/patch-bin_mklib +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib ---- Mesa-8.0.5.orig/bin/mklib 2012-10-24 21:03:58.000000000 +0200 -+++ Mesa-8.0.5/bin/mklib 2013-09-19 11:59:49.000000000 +0200 -@@ -333,12 +333,6 @@ case $ARCH in - # Check if objects are 32-bit and we're running in 64-bit - # environment. If so, pass -m32 flag to linker. - set ${OBJECTS} -- ABI32=`file $1 | grep 32-bit` -- ARM=`file $1 | grep ARM` -- # Do not add "-m32" option for arm. -- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then -- OPTS="-m32 ${OPTS}" -- fi - - if [ "${ALTOPTS}" ] ; then - OPTS=${ALTOPTS} -@@ -392,12 +386,6 @@ case $ARCH in - # Check if objects are 32-bit and we're running in 64-bit - # environment. If so, pass -m32 flag to linker. - set ${OBJECTS} -- ABI32=`file $1 | grep 32-bit` -- ARM=`file $1 | grep ARM` -- # Do not add "-m32" option for arm. -- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then -- OPTS="-m32 ${OPTS}" -- fi - if [ "${ALTOPTS}" ] ; then - OPTS=${ALTOPTS} - fi -@@ -466,12 +454,6 @@ case $ARCH in - # Check if objects are 32-bit and we're running in 64-bit - # environment. If so, pass -m32 flag to linker. - set ${OBJECTS} -- ABI32=`file $1 | grep 32-bit` -- if [ "${ABI32}" ] ; then -- OPTS="-m32 -shared -Wl,-Bdynamic" -- else -- OPTS="-m64 -shared -Wl,-Bdynamic" -- fi - fi - - # If using Sun C++ compiler, need to tell it not to add runpaths diff --git a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c deleted file mode 100644 index b5da190a5..000000000 --- a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c +++ /dev/null @@ -1,39 +0,0 @@ ---- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c 2013-10-08 12:13:11.000000000 +0200 -@@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad - } - #endif - --#ifdef __GLIBC__ --#include <execinfo.h> -- --/* This can only provide dynamic symbols, or binary offsets into a file. -- * -- * To fix this, post-process the output with tools/addr2line.sh -- */ --static INLINE void --debug_symbol_name_glibc(const void *addr, char* buf, unsigned size) --{ -- char** syms = backtrace_symbols((void**)&addr, 1); -- strncpy(buf, syms[0], size); -- buf[size - 1] = 0; -- free(syms); --} --#endif -- - void - debug_symbol_name(const void *addr, char* buf, unsigned size) - { -@@ -176,12 +159,6 @@ debug_symbol_name(const void *addr, char - if(buf[0]) - return; - #endif -- --#ifdef __GLIBC__ -- debug_symbol_name_glibc(addr, buf, size); -- if(buf[0]) -- return; --#endif - - util_snprintf(buf, size, "%p", addr); - buf[size - 1] = 0; diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h deleted file mode 100644 index 5726c5c91..000000000 --- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h +++ /dev/null @@ -1,45 +0,0 @@ ---- Mesa-8.0.5.orig/src/gallium/include/pipe/p_config.h 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/gallium/include/pipe/p_config.h 2013-09-19 12:27:54.000000000 +0200 -@@ -111,7 +111,6 @@ - * Endian detection. - */ - --#ifdef __GLIBC__ - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN -@@ -120,34 +119,6 @@ - # define PIPE_ARCH_BIG_ENDIAN - #endif - --#elif defined(__APPLE__) --#include <machine/endian.h> -- --#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN --# define PIPE_ARCH_LITTLE_ENDIAN --#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN --# define PIPE_ARCH_BIG_ENDIAN --#endif -- --#elif defined(__sun) --#include <sys/isa_defs.h> -- --#if defined(_LITTLE_ENDIAN) --# define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(_BIG_ENDIAN) --# define PIPE_ARCH_BIG_ENDIAN --#endif -- --#else -- --#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) --#define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) --#define PIPE_ARCH_BIG_ENDIAN --#endif -- --#endif -- - #if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN) - #error Unknown Endianness - #endif diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile deleted file mode 100644 index f8f85b7ec..000000000 --- a/package/MesaLib/patches/patch-src_glsl_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- Mesa-8.0.5.orig/src/glsl/Makefile 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/glsl/Makefile 2013-04-30 12:25:40.000000000 +0200 -@@ -167,6 +167,6 @@ builtin_compiler: $(GLSL2_OBJECTS) $(OBJ - - builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler - @echo Regenerating builtin_function.cpp... -- $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp -+ $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp - - -include depend diff --git a/package/MesaLib/patches/patch-src_glsl_strtod_c b/package/MesaLib/patches/patch-src_glsl_strtod_c deleted file mode 100644 index ce6514dbb..000000000 --- a/package/MesaLib/patches/patch-src_glsl_strtod_c +++ /dev/null @@ -1,32 +0,0 @@ ---- Mesa-8.0.5.orig/src/glsl/strtod.c 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/glsl/strtod.c 2013-09-25 17:34:06.000000000 +0200 -@@ -25,14 +25,6 @@ - - - #include <stdlib.h> -- --#ifdef _GNU_SOURCE --#include <locale.h> --#ifdef __APPLE__ --#include <xlocale.h> --#endif --#endif -- - #include "strtod.h" - - -@@ -44,14 +36,5 @@ - double - glsl_strtod(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ -- !defined(__HAIKU__) -- static locale_t loc = NULL; -- if (!loc) { -- loc = newlocale(LC_CTYPE_MASK, "C", NULL); -- } -- return strtod_l(s, end, loc); --#else - return strtod(s, end); --#endif - } diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c deleted file mode 100644 index 10cbca86a..000000000 --- a/package/MesaLib/patches/patch-src_mesa_main_imports_c +++ /dev/null @@ -1,33 +0,0 @@ ---- Mesa-8.0.5.orig/src/mesa/main/imports.c 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/mesa/main/imports.c 2013-09-25 17:41:11.000000000 +0200 -@@ -49,14 +49,6 @@ - #include "mtypes.h" - #include "version.h" - --#ifdef _GNU_SOURCE --#include <locale.h> --#ifdef __APPLE__ --#include <xlocale.h> --#endif --#endif -- -- - #define MAXSTRING 4000 /* for vsnprintf() */ - - #ifdef WIN32 -@@ -766,14 +758,7 @@ _mesa_strdup( const char *s ) - float - _mesa_strtof( const char *s, char **end ) - { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ -- !defined(ANDROID) && !defined(__HAIKU__) -- static locale_t loc = NULL; -- if (!loc) { -- loc = newlocale(LC_CTYPE_MASK, "C", NULL); -- } -- return strtof_l(s, end, loc); --#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) -+#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) - return strtof(s, end); - #else - return (float)strtod(s, end); diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_h b/package/MesaLib/patches/patch-src_mesa_main_imports_h deleted file mode 100644 index 43896c847..000000000 --- a/package/MesaLib/patches/patch-src_mesa_main_imports_h +++ /dev/null @@ -1,13 +0,0 @@ ---- Mesa-8.0.5.orig/src/mesa/main/imports.h 2012-10-24 21:03:59.000000000 +0200 -+++ Mesa-8.0.5/src/mesa/main/imports.h 2013-09-19 12:39:53.000000000 +0200 -@@ -568,10 +568,8 @@ _mesa_init_sqrt_table(void); - - #ifdef __GNUC__ - --#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID) || defined(__APPLE__) - #define ffs __builtin_ffs - #define ffsll __builtin_ffsll --#endif - - #define _mesa_ffs(i) ffs(i) - #define _mesa_ffsll(i) ffsll(i) diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c deleted file mode 100644 index f178bfef0..000000000 --- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-8.0.5.orig/src/mesa/main/querymatrix.c 2012-03-30 18:19:03.000000000 +0200 -+++ Mesa-8.0.5/src/mesa/main/querymatrix.c 2013-09-19 12:19:01.000000000 +0200 -@@ -70,7 +70,7 @@ fpclassify(double x) - } - } - --#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ -+#elif defined(fpclassify) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ - defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ - (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ - (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) diff --git a/package/db/Makefile b/package/db/Makefile index 3a65ba83d..798964f94 100644 --- a/package/db/Makefile +++ b/package/db/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= db PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db PKG_SITES:= http://www.openadk.org/distfiles/ PKG_NEED_CXX:= 1 +PKG_LIBNAME:= libdb PKG_OPTS:= dev WRKBUILD= ${WRKSRC}/build_unix @@ -39,6 +40,6 @@ CONFIGURE_ARGS+= --enable-smallbuild \ libdb-install: ${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib - ${CP} ${WRKINST}/usr/lib/libdb*.so ${IDIR_LIBDB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libdb*.so* ${IDIR_LIBDB}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/expat/Makefile b/package/expat/Makefile index c5f676d3d..0ecb2f14c 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= a XML parsing library PKG_SECTION:= libs PKG_URL:= http://expat.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_LIBNAME:= libexpat PKG_OPTS:= dev ifeq ($(ADK_STATIC),y) diff --git a/package/file/Makefile b/package/file/Makefile index b96ee1d87..268206130 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 5.11 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 16a407bd66d6c7a832f3a5c0d609c27b +PKG_VERSION:= 5.15 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3f99565532f548d7540912c4642d1ede PKG_DESCR:= a file type guesser PKG_SECTION:= utils -PKG_DEPENDS:= libmagic +PKG_DEPENDS:= libmagic libgcc PKG_URL:= http://www.darwinsys.com/file PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ ftp://ftp.astron.com/pub/file/ @@ -24,19 +24,19 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libmix endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call HOST_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS})) -pre-configure: - (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure --enable-static --disable-shared \ - --disable-warnings \ - ); - ${MAKE} -C ${WRKBUILD} - ${INSTALL_BIN} ${WRKBUILD}/src/file ${WRKBUILD}/magic - ${MAKE} -C ${WRKBUILD} clean +HOST_CONFIGURE_ARGS+= --enable-static \ + --disable-shared \ + --disable-warnings +file-hostinstall: + ${INSTALL_BIN} ${HOST_WRKINST}/usr/bin/file \ + ${STAGING_HOST_DIR}/usr/bin file-install: ${INSTALL_DIR} ${IDIR_FILE}/usr/bin @@ -49,4 +49,5 @@ libmagic-install: ${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib ${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/file/patches/patch-magic_Makefile_in b/package/file/patches/patch-magic_Makefile_in deleted file mode 100644 index 1a8b3a66c..000000000 --- a/package/file/patches/patch-magic_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- file-5.11.orig/magic/Makefile.in 2012-02-21 20:17:03.000000000 +0100 -+++ file-5.11/magic/Makefile.in 2012-03-02 17:23:17.000000000 +0100 -@@ -450,7 +450,7 @@ CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_D - - # FIXME: Build file natively as well so that it can be used to compile - # the target's magic file; for now we bail if the local version does not match --@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file -+@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = ./file - @IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE) - @IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP = - all: all-am diff --git a/package/glib/Makefile b/package/glib/Makefile index 732f2bc0a..fef89ccab 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.28.1 PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs @@ -17,14 +17,14 @@ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_NOPARALLEL:= 1 PKG_OPTS:= dev -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) @@ -41,19 +41,17 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes +HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \ + --enable-debug=no \ + --disable-fam -pre-configure: -ifeq ($(OStype),Linux) - (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - ./configure --prefix=$(STAGING_HOST_DIR) \ - ) - ${MAKE} -C ${WRKBUILD} V=1 - $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin - $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin - $(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin - ${MAKE} -C ${WRKBUILD} clean -endif - +glib-hostinstall: + $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-compile-schemas \ + ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-genmarshal \ + ${STAGING_HOST_DIR}/usr/bin + $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-mkenums \ + ${STAGING_HOST_DIR}/usr/bin glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib @@ -67,13 +65,9 @@ glib-install: ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include ${CP} ${WRKINST}/usr/lib/glib-2.0/include/glibconfig.h \ ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_GLIB_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_GLIB_DEV}/usr/lib/pkgconfig ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/glib-genmarshal \ ${IDIR_GLIB_DEV}/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 114c473d9..458581038 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libiconv -PKG_VERSION:= 1.13.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7ab33ebd26687c744a37264a330bbe9a +PKG_VERSION:= 1.14 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e34509b1623cec449dfeb73d7ce9c6c6 PKG_DESCR:= character set conversion library PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/libiconv/ @@ -21,12 +21,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -TARGET_CFLAGS+= -fPIC -FAKE_FLAGS+= libdir="${WRKINST}/usr/lib" \ - includedir="${WRKINST}/usr/include" \ -INSTALL_TARGET= install-lib - libiconv-install: ${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib ${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/ diff --git a/package/libiconv/patches/patch-build-aux_ltmain_sh b/package/libiconv/patches/patch-build-aux_ltmain_ |