diff options
26 files changed, 61 insertions, 260 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 84998df38..1ca851d26 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -92,6 +92,7 @@ ifeq (${HOST_STYLE},manual) env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE) endif env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE) + @find $(STAGING_HOST_DIR) -name \*.la -delete @touch $@ ${_HOST_COOKIE}: diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 602cbbac9..e9658f5e0 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -27,6 +27,7 @@ HOST_LINUX_ONLY:= 1 endif TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1 +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-python alsa-lib-install: diff --git a/package/alsa-lib/patches/patch-libtool b/package/alsa-lib/patches/patch-libtool deleted file mode 100644 index 7879d575a..000000000 --- a/package/alsa-lib/patches/patch-libtool +++ /dev/null @@ -1,177 +0,0 @@ ---- alsa-lib-1.0.27.2.orig/libtool 2013-07-08 14:32:53.000000000 +0200 -+++ alsa-lib-1.0.27.2/libtool 2013-12-30 17:42:30.000000000 +0100 -@@ -1,8 +1,8 @@ --#! /bin/sh -+#! /bin/bash - - # libtool - Provide generalized library-building support services. - # Generated automatically by config.status (alsa-lib) 1.0.27.2 --# Libtool was configured on host alsa.alsa-project.org: -+# Libtool was configured on host helium: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -@@ -40,7 +40,7 @@ available_tags="" - # ### BEGIN LIBTOOL CONFIG - - # Whether or not to build static libraries. --build_old_libs=no -+build_old_libs=yes - - # Which release of libtool.m4 was used? - macro_version=2.4.2 -@@ -56,7 +56,7 @@ pic_mode=default - fast_install=yes - - # Shell to use when invoking shell scripts. --SHELL="/bin/sh" -+SHELL="/bin/bash" - - # An echo program that protects backslashes. - ECHO="printf %s\\n" -@@ -65,38 +65,38 @@ ECHO="printf %s\\n" - PATH_SEPARATOR=":" - - # The host system. --host_alias= --host=x86_64-unknown-linux-gnu -+host_alias=i686-openadk-linux -+host=i686-openadk-linux-gnu - host_os=linux-gnu - - # The build system. --build_alias= --build=x86_64-unknown-linux-gnu -+build_alias=x86_64-linux-gnu -+build=x86_64-pc-linux-gnu - build_os=linux-gnu - - # A sed program that does not truncate output. --SED="/usr/bin/sed" -+SED="/home/wbx/ibmx40/scripts/sed" - - # Sed that helps us avoid accidentally triggering echo(1) options like -n. - Xsed="$SED -e 1s/^X//" - - # A grep program that handles long lines. --GREP="/usr/bin/grep" -+GREP="/bin/grep" - - # An ERE matcher. --EGREP="/usr/bin/grep -E" -+EGREP="/bin/grep -E" - - # A literal string matcher. --FGREP="/usr/bin/grep -F" -+FGREP="/bin/grep -F" - - # A BSD- or MS-compatible name lister. --NM="/usr/bin/nm -B" -+NM="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-nm" - - # Whether we need soft or hard links. - LN_S="ln -s" - - # What is the maximum length of a command? --max_cmd_len=1572864 -+max_cmd_len=3458764513820540925 - - # Object file suffix (normally "o"). - objext=o -@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop - to_tool_file_cmd=func_convert_file_noop - - # An object symbol dumper. --OBJDUMP="objdump" -+OBJDUMP="i686-openadk-linux-objdump" - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method="pass_all" -@@ -141,7 +141,7 @@ DLLTOOL="false" - sharedlib_from_linklib_cmd="printf %s\\n" - - # The archiver. --AR="ar" -+AR="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ar" - - # Flags to create an archive. - AR_FLAGS="cru" -@@ -150,10 +150,10 @@ AR_FLAGS="cru" - archiver_list_spec="@" - - # A symbol stripping program. --STRIP="strip" -+STRIP="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip" - - # Commands used to install an old-style archive. --RANLIB="ranlib" -+RANLIB="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ranlib" - old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib" - old_postuninstall_cmds="" - -@@ -161,10 +161,10 @@ old_postuninstall_cmds="" - lock_old_archive_extraction=no - - # A C compiler. --LTCC="gcc" -+LTCC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc" - - # LTCC compiler flags. --LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE" -+LTCFLAGS="-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -D_GNU_SOURCE" - - # Take the output of nm and produce a listing of raw symbols and C names. - global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" -@@ -272,27 +272,27 @@ finish_eval="" - hardcode_into_libs=yes - - # Compile-time system search path for libraries. --sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.2 /usr/lib64 /lib64 " -+sys_lib_search_path_spec="/home/wbx/ibmx40/host_i686_musl_musl/lib/gcc/i686-openadk-linux-musl/4.7.3 /home/wbx/ibmx40/host_i686_musl_musl/i686-openadk-linux-musl/lib /home/wbx/ibmx40/target_i686_musl_musl/lib /home/wbx/ibmx40/target_i686_musl_musl/usr/lib " - - # Run-time system search path for libraries. --sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/mysql /usr/lib64/qt-3.3/lib " -+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu " - - # Whether dlopen is supported. - dlopen_support=yes - - # Whether dlopen of programs is supported. --dlopen_self=yes -+dlopen_self=unknown - - # Whether dlopen of statically linked programs is supported. --dlopen_self_static=yes -+dlopen_self_static=unknown - - # Commands to strip libraries. --old_striplib="strip --strip-debug" --striplib="strip --strip-unneeded" -+old_striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-debug" -+striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-unneeded" - - - # The linker used to build libraries. --LD="/usr/bin/ld -m elf_x86_64" -+LD="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ld" - - # How to create reloadable object files. - reload_flag=" -r" -@@ -302,7 +302,7 @@ reload_cmds="\$LD\$reload_flag -o \$outp - old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" - - # A language specific compiler. --CC="gcc" -+CC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc" - - # Is the compiler the GNU compiler? - with_gcc=yes -@@ -317,7 +317,7 @@ pic_flag=" -fPIC -DPIC" - wl="-Wl," - - # Compiler flag to prevent dynamic linking. --link_static_flag="" -+link_static_flag="-static" - - # Does compiler simultaneously support -c and -o options? - compiler_c_o="yes" diff --git a/package/alsa-lib/patches/patch-utils_alsa_pc_in b/package/alsa-lib/patches/patch-utils_alsa_pc_in deleted file mode 100644 index d04f80248..000000000 --- a/package/alsa-lib/patches/patch-utils_alsa_pc_in +++ /dev/null @@ -1,12 +0,0 @@ ---- alsa-lib-1.0.27.2.orig/utils/alsa.pc.in 2013-07-08 14:31:36.000000000 +0200 -+++ alsa-lib-1.0.27.2/utils/alsa.pc.in 2014-01-01 17:07:29.000000000 +0100 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: alsa - Description: Advanced Linux Sound Architecture (ALSA) - Library diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5435d1fdf..472d401e9 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= cafe9f210e45360279c730d27bf071e9 PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib -PKG_BUILDDEP:= zlib freetype-host +PKG_BUILDDEP:= zlib PKG_URL:= http://www.freetype.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} PKG_LIBNAME:= libfreetype @@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --with-zlib \ --without-png \ --without-bzip2 diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in deleted file mode 100644 index c4d32d67e..000000000 --- a/package/freetype/patches/patch-builds_unix_freetype2_in +++ /dev/null @@ -1,19 +0,0 @@ ---- freetype-2.5.3.orig/builds/unix/freetype2.in 2014-03-02 18:00:45.527427412 +0100 -+++ freetype-2.5.3/builds/unix/freetype2.in 2014-05-14 18:39:37.626952859 +0200 -@@ -1,7 +1,7 @@ - prefix="%prefix%" --exec_prefix="%exec_prefix%" --libdir="%libdir%" --includedir="%includedir%/freetype2" -+exec_prefix="${prefix}" -+libdir="${prefix}/lib" -+includedir="${prefix}/include" - - Name: FreeType 2 - URL: http://freetype.org -@@ -11,4 +11,4 @@ Requires: - Requires.private: %REQUIRES_PRIVATE% - Libs: -L${libdir} -lfreetype - Libs.private: %LIBS_PRIVATE% --Cflags: -I${includedir} -+Cflags: -I${includedir} -I${includedir}/freetype2 diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile index 981e5cb3e..50a21e9ea 100644 --- a/package/icu4c/Makefile +++ b/package/icu4c/Makefile @@ -26,6 +26,7 @@ $(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN CFLAGS_FOR_BUILD+= -fPIC CXXFLAGS_FOR_BUILD+= -fPIC +HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --enable-extras=no \ --enable-samples=no \ --enable-tests=no \ diff --git a/package/libICE/Makefile b/package/libICE/Makefile index 3b12909f7..0593c92bb 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -23,6 +23,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libice-install: ${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib ${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib diff --git a/package/libSM/Makefile b/package/libSM/Makefile index 606f6eda2..fda460710 100644 --- a/package/libSM/Makefile +++ b/package/libSM/Makefile @@ -23,6 +23,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libsm-install: ${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib ${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib diff --git a/package/libX11/Makefile b/package/libX11/Makefile index a4c45ad43..cc5e0dc17 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -31,7 +31,11 @@ CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ --disable-xf86bigfont \ --disable-malloc0returnsnull -HOST_CONFIGURE_ARGS+= $(CONFIGURE_ARGS) +HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --enable-xlocale \ + --disable-specs \ + --disable-xf86bigfont \ + --disable-malloc0returnsnull libx11-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 57bc980c0..f4cf53fcc 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -23,6 +23,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + libxau-install: ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/ diff --git a/package/libXext/Makefile b/package/libXext/Makefile index e3eb9f5b0..9e5d221fa 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -22,6 +22,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxext-install: diff --git a/package/libXi/Makefile b/package/libXi/Makefile index 7d0169d55..2b366dee1 100644 --- a/package/libXi/Makefile +++ b/package/libXi/Makefile @@ -23,6 +23,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxi-install: diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile index 1729a39ea..cfa4637d6 100644 --- a/package/libXinerama/Makefile +++ b/package/libXinerama/Makefile @@ -23,6 +23,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxinerama-install: diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index e812545de..ab6a20791 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -24,6 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxrender-install: diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 183b20de5..3cd4d839d 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -26,6 +26,7 @@ $(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) AUTOTOOL_STYLE:= autoreconf +HOST_STYLE:= auto CONFIGURE_ENV+= CFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)" CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 6e473220a..4790863e4 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -26,6 +26,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxtst-install: diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 28bda4f6c..8dffea1f3 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -25,6 +25,7 @@ $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP include $(TOPDIR)/mk/python.mk +HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) libxcb-install: diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index c502d63f0..b4757fc55 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -33,6 +33,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE include $(TOPDIR)/mk/python.mk +HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --with-python \ --without-iconv \ --without-lzma \ diff --git a/package/lzma/Makefile b/package/lzma/Makefile index 7754e7543..35b197bf2 100644 --- a/package/lzma/Makefile +++ b/package/lzma/Makefile @@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,LZMA,lzma,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LZMA,lzma,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto + lzma-install: $(INSTALL_DIR) $(IDIR_LZMA)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/lzma $(IDIR_LZMA)/usr/bin diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 449dd45fd..db2623694 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openjdk7 PKG_VERSION:= 2.4.7 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= f6b28633b9978fadc724247cfc264ff0 PKG_DESCR:= java virtual machine PKG_SECTION:= dev/lang @@ -14,7 +14,7 @@ PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst PKG_BUILDDEP+= libpng giflib gtk+ glib fontconfig nss HOST_BUILDDEP:= fastjar-host gcj-host ecj-host classpath-host jamvm-host HOST_BUILDDEP+= jikes-host ant-host libXtst-host libXt-host libXinerama-host -HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host +HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host freetype-host PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi cups PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo PKG_DEPENDS+= libpng giflib libgtk glib fontconfig @@ -28,7 +28,7 @@ GCJ_VER:= 4.8.2 PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 -PKG_LIBC_DEPENDS:= uclibc glibc +PKG_LIBC_DEPENDS:= uclibc glibc musl include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk @@ -109,26 +109,25 @@ OPENJDK_NATIVE_ENV:= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$ HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV) HOST_ALL_TARGET:= icedtea-boot -HOST_CONFIGURE_ARGS+=\ - --enable-bootstrap \ - --enable-zero \ - --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \ - --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${DL_DIR}/ecj-4.9.jar \ - --without-hotspot-build \ - --disable-system-zlib \ - --disable-system-jpeg \ - --disable-system-lcms \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ - --disable-system-kerberos \ - --disable-system-fontconfig \ - --disable-compile-against-syscalls \ - --without-rhino \ - --disable-docs +HOST_CONFIGURE_ARGS+= --enable-bootstrap \ + --enable-zero \ + --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ + --with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \ + --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ + --with-ecj-jar=${DL_DIR}/ecj-4.9.jar \ + --without-hotspot-build \ + --disable-system-zlib \ + --disable-system-jpeg \ + --disable-system-lcms \ + --disable-system-png \ + --disable-system-gif \ + --disable-system-gtk \ + --disable-system-gio \ + --disable-system-kerberos \ + --disable-system-fontconfig \ + --disable-compile-against-syscalls \ + --without-rhino \ + --disable-docs hostpost-install: -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk diff --git a/package/util-macros/Makefile b/package/util-macros/Makefile index 676221def..db1a5035d 100644 --- a/package/util-macros/Makefile +++ b/package/util-macros/Makefile @@ -5,11 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= util-macros PKG_VERSION:= 1.18.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= fd0ba21b3179703c071bbb4c3e5fb0f4 PKG_DESCR:= xorg macros PKG_SECTION:= x11/misc -PKG_BUILDDEP:= autotool util-macros-host PKG_URL:= http://cgit.freedesktop.org/xorg/util/macros PKG_SITES:= http://xorg.freedesktop.org/archive/individual/util/ PKG_OPTS:= dev devonly @@ -22,7 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf +HOST_STYLE:= auto include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-macros/patches/patch-Makefile_am b/package/util-macros/patches/patch-Makefile_am deleted file mode 100644 index 40e2951d5..000000000 --- a/package/util-macros/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- util-macros-1.8.0.orig/Makefile.am 2010-03-29 17:47:02.000000000 +0200 -+++ util-macros-1.8.0/Makefile.am 2013-10-28 18:08:50.000000000 +0100 -@@ -29,7 +29,7 @@ dist_pkgdata_DATA = INSTALL - install-data-hook: - rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 - --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = xorg-macros.pc - - .PHONY: ChangeLog diff --git a/package/util-macros/patches/patch-Makefile_in b/package/util-macros/patches/patch-Makefile_in deleted file mode 100644 index 1d472707b..000000000 --- a/package/util-macros/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- util-macros-1.8.0.orig/Makefile.in 2010-05-27 21:02:01.000000000 +0200 -+++ util-macros-1.8.0/Makefile.in 2013-10-28 18:32:09.000000000 +0100 -@@ -167,7 +167,7 @@ top_srcdir = @top_srcdir@ - aclocaldir = $(datadir)/aclocal - aclocal_DATA = xorg-macros.m4 - dist_pkgdata_DATA = INSTALL --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = xorg-macros.pc - all: all-am - diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index c5097c513..2dcfcc5d1 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -27,12 +27,21 @@ $(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},$ include $(TOPDIR)/mk/python.mk +HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) -CONFIGURE_ARGS+= --datadir=${STAGING_TARGET_DIR}/usr/share + +# pkg-config variables are not fixed up with sysroot +hostpost-install: + $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_HOST_DIR)|' \ + -e 's|^\(pythondir=\)|\1$(STAGING_HOST_DIR)|' \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig/xcb-proto.pc post-build: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb + $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_TARGET_DIR)|' \ + -e 's|^\(pythondir=\)|\1$(STAGING_TARGET_DIR)|' \ + $(WRKBUILD)/xcb-proto.pc xcb-python-install: $(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile index 3a0bce2e5..c84549061 100644 --- a/package/xtrans/Makefile +++ b/package/xtrans/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_CONFIGURE_ARGS+= --datadir=$(STAGING_HOST_DIR)/usr/lib +HOST_STYLE:= auto CONFIGURE_ARGS+= --datadir=/usr/lib include ${TOPDIR}/mk/host-bottom.mk |