From ee4b6c9485e3e2f2fb46bab921ae452fe565d869 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Jan 2011 19:49:45 +0100 Subject: install empty header stub --- package/eglibc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/eglibc') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 27e271f44..0f15c3e10 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -89,6 +89,7 @@ eglibc-dev-install: PATH='${TARGET_PATH}' \ $(MAKE) -C $(WRKBUILD) \ install-headers install-bootstrap-headers=yes + @touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs.h @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \; @find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \; # conflicts with libiconv -- cgit v1.2.3 From 5a65c76bc3d72ea9f275a3c474d5e308cf367a82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Jan 2011 23:18:06 +0100 Subject: remove obsolete SUB_INSTALL stuff. --- TODO | 6 +++++- package/DirectFB/Makefile | 6 +----- package/ImageMagick/Makefile | 7 +------ package/alsa-lib/Makefile | 6 +----- package/asterisk/Makefile | 15 +-------------- package/busybox/Makefile | 10 +--------- package/curl/Makefile | 7 +------ package/e2fsprogs/Makefile | 3 ++- package/e2fsprogs/patches/patch-debugfs_dump_c.orig | 10 ---------- package/e2fsprogs/patches/patch-e2fsprogs_spec | 11 ----------- package/eglibc/Makefile | 6 +----- package/expat/Makefile | 6 +----- package/ffmpeg/Makefile | 6 +----- package/glibc/Makefile | 6 +----- package/iptables/Makefile | 4 +--- package/jpeg/Makefile | 6 +----- package/krb5/Makefile | 6 +----- package/libX11/Makefile | 6 +----- package/libXau/Makefile | 7 +------ package/libXcomposite/Makefile | 6 +----- package/libXdmcp/Makefile | 7 +------ package/libXext/Makefile | 6 +----- package/libevent/Makefile | 6 +----- package/libmad/Makefile | 6 +----- package/libnl/Makefile | 6 +----- package/libogg/Makefile | 6 +----- package/libp11/Makefile | 6 +----- package/libpng/Makefile | 6 +----- package/libtiff/Makefile | 6 +----- package/libtool/Makefile | 7 +------ package/libusb-compat/Makefile | 6 +----- package/libusb/Makefile | 6 +----- package/libvorbis/Makefile | 8 +++----- package/ncurses/Makefile | 6 +----- package/openct/Makefile | 6 +----- package/opensc/Makefile | 6 +----- package/openssl/Makefile | 8 +++----- package/openvpn/Makefile | 6 +----- package/pcsc-lite/Makefile | 6 +----- package/ppp/Makefile | 12 +----------- package/sdl-image/Makefile | 6 +----- package/sdl/Makefile | 6 +----- package/uclibc/Makefile | 6 +----- package/ulogd/Makefile | 9 +-------- 44 files changed, 51 insertions(+), 248 deletions(-) delete mode 100644 package/e2fsprogs/patches/patch-debugfs_dump_c.orig delete mode 100644 package/e2fsprogs/patches/patch-e2fsprogs_spec (limited to 'package/eglibc') diff --git a/TODO b/TODO index 6e95a3ff7..256db6783 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,12 @@ +- rework subinstall logic +- fix autoreconf usage in opensc +- fix timezone stuff in eglibc/glibc +- add back aufs2 patches for kernel - openssl ocf support check - new package minidlna - wget/curl/ftp download support - fix heimdal package -- check all patches for CFLAGS compliance +- check all patches for CFLAGS compliance, fhonour patch from FreeWRT - busybox update and SuSv3 removal - check rtc support on foxg20 - relocatable gcc (adk) diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 45dc3e13f..21f1ec30b 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -43,11 +43,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDEMULATION=elf64ltsmip endif -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_DIRECTFB_DEV}+= directfb-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_DIRECTFB}/etc ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/ $(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm} diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 648befeeb..895b4c001 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -35,14 +35,9 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_CONVERT}+= convert-install -SUB_INSTALLS-${ADK_PACKAGE_DISPLAY}+= display-install - CONFIGURE_ARGS+= --with-magick-plus-plus=no -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config $(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \ diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 679efb111..fdc0a08cd 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -25,11 +25,7 @@ $(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEAS CONFIGURE_ARGS+= --disable-python -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ALSA_LIB_DEV}+= alsa-lib-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa ${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/ ${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index bdf44fb96..2b1fc70a5 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -44,19 +44,6 @@ $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)- $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PGSQL}+= asterisk-pgsql-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_VOICEMAIL}+= asterisk-voicemail-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_SOUNDS}+= asterisk-sounds-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_MGCP}+= asterisk-chan-mgcp-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_SKINNY}+= asterisk-chan-skinny-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CHAN_IAX2}+= asterisk-chan-iax2-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_SPEEX}+= asterisk-codec-speex-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+= asterisk-codec-gsm-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+= asterisk-pbx-dundi-install -SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+= asterisk-res-agi-install - CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ --with-ncurses=${STAGING_TARGET_DIR}/usr \ --with-ssl=${STAGING_TARGET_DIR}/usr \ @@ -132,7 +119,7 @@ post-build: tar xzf asterisk-core-sounds-en-gsm-1.4.19.tar.gz ; \ rm asterisk-core-sounds-en-gsm-1.4.19.tar.gz -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: $(CP) $(WRKINST)/* $(IDIR_ASTERISK) rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey rm -rf $(IDIR_ASTERISK)/usr/bin diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d0375cfe9..bcd582179 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -23,14 +23,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_UDHCPD}+= udhcpd-install - -ifeq (${DEVELOPER},1) -SUB_INSTALLS-y+= udhcpd-install -endif - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -60,7 +52,7 @@ else IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) diff --git a/package/curl/Makefile b/package/curl/Makefile index ab6e45416..c9992052a 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -30,11 +30,6 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_CURL}+= curl-install -SUB_INSTALLS-${ADK_PACKAGE_LIBCURL_DEV}+= libcurl-dev-install - CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ @@ -63,7 +58,7 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1eb65d222..c54538f0c 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -33,8 +33,9 @@ $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},, $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS})) $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) -CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls +CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs +TCFLAGS+= -pthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig deleted file mode 100644 index 7e9b233fa..000000000 --- a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig +++ /dev/null @@ -1,10 +0,0 @@ ---- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 -+++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:27:59.000000000 +0100 -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #ifdef HAVE_GETOPT_H - #include - #else diff --git a/package/e2fsprogs/patches/patch-e2fsprogs_spec b/package/e2fsprogs/patches/patch-e2fsprogs_spec deleted file mode 100644 index ad10f98dc..000000000 --- a/package/e2fsprogs/patches/patch-e2fsprogs_spec +++ /dev/null @@ -1,11 +0,0 @@ ---- e2fsprogs-1.41.14.orig/e2fsprogs.spec 2010-12-13 14:57:34.000000000 +0100 -+++ e2fsprogs-1.41.14/e2fsprogs.spec 2010-12-25 22:24:46.000000000 +0100 -@@ -5,7 +5,7 @@ - - Summary: Utilities for managing ext2/ext3/ext4 filesystems - Name: e2fsprogs --Version: 1.41.13 -+Version: 1.41.14 - Release: 0 - License: GPLv2 - Group: System Environment/Base diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 0f15c3e10..50c75b1f2 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -20,10 +20,6 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+= eglibc-dev-install - EGLIBC_CONFOPTS:= \ --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ @@ -51,7 +47,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_slibdir="/lib" # compile nothing, eglibc is already build in toolchain directory -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ $(IDIR_EGLIBC)/usr/lib test -z $(ADK_RUNTIME_TIMEZONE) || \ diff --git a/package/expat/Makefile b/package/expat/Makefile index 28fde3a50..0ff841f4c 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -25,11 +25,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBEXPAT_DEV}+= libexpat-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index bfcb74413..082bfe171 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -27,10 +27,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+= ffplay-install - ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS:= --enable-mmx else @@ -76,7 +72,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-libfaad \ ${CONFIGURE_CPU_OPTS} -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 8b4584373..f3e757d95 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -20,12 +20,8 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-install - # compile nothing, glibc is already build in toolchain directory -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ diff --git a/package/iptables/Makefile b/package/iptables/Makefile index aac6179a0..d9229dc50 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -37,9 +37,7 @@ $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${P CONFIGURE_ARGS+= --enable-devel -SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+= ip6tables-install - -post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y} +post-install: ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} ${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin/ diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index b4609e757..911e5c474 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_JPEG_DEV}+= jpeg-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 3e49475b6..c7ec9955d 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -27,10 +27,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBKRB5}+= libkrb5-install - TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ @@ -50,7 +46,7 @@ pre-build: # fix nm call in script, we need the GNU version of nm $(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 92f1f52aa..322c190a7 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -26,10 +26,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBX11_DEV},${PKGSC_LIBX11_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBX11_DEV}+=libx11-dev-install - XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ @@ -37,7 +33,7 @@ CONFIGURE_ARGS+= --enable-xlocale \ --disable-malloc0returnsnull \ --without-xcb -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11 diff --git a/package/libXau/Makefile b/package/libXau/Makefile index 21d31154e..41d6adcaf 100644 --- a/package/libXau/Makefile +++ b/package/libXau/Makefile @@ -24,12 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXAU_DEV,libxau-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXAU_DEV},${PKGSC_LIBXAU_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXAU_DEV}+=libxau-dev-install - - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/ diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile index fc395a708..48b1e3c82 100644 --- a/package/libXcomposite/Makefile +++ b/package/libXcomposite/Makefile @@ -25,13 +25,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXCOMPOSITE_DEV}+= libxcomposite-dev-install - CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib ${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/ diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index f4a731f9c..4181933ca 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -24,11 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXDMCP_DEV,libxdmcp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXDMCP_DEV},${PKGSC_LIBXDMCP_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXDMCP_DEV}+=libxdmcp-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib ${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/ @@ -37,5 +33,4 @@ libxdmcp-dev-install: ${CP} ${WRKINST}/usr/include/X11/* \ ${IDIR_LIBXDMCP_DEV}/usr/include/X11/ - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXext/Makefile b/package/libXext/Makefile index 3763d444f..ec311b067 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -25,13 +25,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBXEXT_DEV}+=libxext-dev-install - CONFIGURE_ARGS+= --disable-malloc0returnsnull -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/ diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 829162b10..a11099ab0 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -21,11 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEVENT_DEV},${PKGSC_LIBEVENT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBEVENT_DEV}+= libevent-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib $(CP) $(WRKINST)/usr/lib/libevent*.so* \ $(IDIR_LIBEVENT)/usr/lib/ diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 05cd0a948..0b708732d 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -30,10 +30,6 @@ endif #FPM:=mips #endif -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBMAD_DEV}+= libmad-dev-install - CONFIGURE_ARGS+= --enable-fpm=${FPM} \ --disable-debugging \ --enable-speed @@ -42,7 +38,7 @@ pre-install: ${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig ${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib ${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/ diff --git a/package/libnl/Makefile b/package/libnl/Makefile index d7021a844..ab8be464e 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -20,11 +20,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNL_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBNL_DEV}+= libnl-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib ${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib diff --git a/package/libogg/Makefile b/package/libogg/Makefile index a672bbe3a..f9d5e5fe9 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -21,11 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOGG_DEV}+= libogg-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib ${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/ diff --git a/package/libp11/Makefile b/package/libp11/Makefile index 9ba2fec39..8c3536e0e 100644 --- a/package/libp11/Makefile +++ b/package/libp11/Makefile @@ -23,11 +23,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBP11_DEV}+= libp11-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib ${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 83408d1d3..92365bf63 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBPNG_DEV}+= libpng-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib ${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/ diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index ebd9988bf..5ba22f507 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -28,13 +28,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBTIFF_DEV}+= libtiff-dev-install - CONFIGURE_ARGS+= --disable-cxx -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ diff --git a/package/libtool/Makefile b/package/libtool/Makefile index e22290dcf..bfc3695eb 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -29,12 +29,7 @@ endif CONFIGURE_ARGS+= --enable-ltdl-install -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBLTDL}+= libltdl-install -SUB_INSTALLS-${ADK_PACKAGE_LIBLTDL_DEV}+= libltdl-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile index d7f46c858..728f5b5d1 100644 --- a/package/libusb-compat/Makefile +++ b/package/libusb-compat/Makefile @@ -28,11 +28,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBUSB_COMPAT_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_COMPAT_DEV},${PKGSC_LIBUSB_COMPAT_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_COMPAT_DEV}+= libusb-compat-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/ diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 4358bc720..189329275 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -27,11 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBUSB_DEV}+= libusb-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib ${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/ diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 484ffa867..a980c64a7 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -23,19 +23,17 @@ $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+= libvorbis-dev-install - CONFIGURE_ENV+= LIBS="-lm -logg" CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \ --with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib" -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib ${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/ ${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/ + +libvorbisenc-install: ${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib ${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/ diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c1b142dff..78b1c05cd 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBNCURSES_DEV}+= libncurses-dev-install - CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ @@ -64,7 +60,7 @@ pre-configure: find ${WRKBUILD} -name *.o -exec rm {} \; find ${WRKBUILD} -name *.a -exec rm {} \; -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: # this is installed as libncurses - make libcurses a "link" rm -f ${WRKINST}/usr/lib/libcurses.so* echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so diff --git a/package/openct/Makefile b/package/openct/Makefile index 1164c4a13..b2e5e8a79 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -27,11 +27,7 @@ $(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK $(eval $(call PKG_template,LIBOPENCT,libopenct,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENCT},${PKGSD_LIBOPENCT},${PKGSC_LIBOPENCT})) $(eval $(call PKG_template,LIBOPENCT_DEV,libopenct-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBOPENCT_DEV},${PKGSC_LIBOPENCT_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENCT_DEV}+= libopenct-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/{sbin,bin} ${INSTALL_BIN} ${WRKINST}/usr/sbin/openct-control \ ${IDIR_OPENCT}/usr/sbin diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 96c3e4138..88a85939e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -32,14 +32,10 @@ CONFIGURE_ARGS+= --disable-man \ --enable-pcsc \ --enable-openct -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSC_DEV}+= libopensc-dev-install - post-extract: cd ${WRKBUILD} && autoreconf -vif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc ${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f0fdc50fb..0d30b8f63 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -32,10 +32,6 @@ $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},$ $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV})) $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSSL_DEV}+= libopenssl-dev-install - CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -74,10 +70,12 @@ do-build: OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ all build-shared -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* + +openssl-util-install: ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/usr/bin ${CP} ${WRKINST}/usr/bin/openssl ${IDIR_OPENSSL_UTIL}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private} diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 774a63ea9..f2ecc8823 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -60,11 +60,7 @@ CONFIGURE_ARGS+= --disable-pthread \ --without-ifconfig-path \ --without-route-path -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${OPENVPN_EASY_RSA}+= openvpn-easy-rsa-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn ${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ $(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/ diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index ca95456cc..003352a69 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -27,11 +27,7 @@ $(eval $(call PKG_template,PCSC_LITE_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RE CONFIGURE_ARGS+= --disable-libhal -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_PCSC_LITE_DEV}+= pcsc-lite-dev-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 591f3ca2a..e711e005f 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -37,17 +37,7 @@ XAKE_FLAGS+= CC="${TARGET_CC}" \ DESTDIR="${WRKINST}/usr" \ TARGET_AR='${TARGET_CROSS}ar' -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPOE}+= mod-pppoe-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPOA}+= mod-pppoa-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_RADIUS}+= mod-radius-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_CHAT}+= mod-chat-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPDUMP}+= mod-pppdump-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPSTATS}+= mod-pppstats-install -SUB_INSTALLS-${ADK_PACKAGE_PPP_MOD_PPPUMTS}+= mod-pppumts-install - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_PPP}/etc/ppp install -m0600 ./files/etc/ppp/chap-secrets ${IDIR_PPP}/etc/ppp/ ${INSTALL_DATA} ./files/etc/ppp/options ${IDIR_PPP}/etc/ppp/ diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 37c0b9a98..8d6105e58 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -26,16 +26,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+= libsdl-image-dev-install - CONFIGURE_ARGS+= --enable-png \ --enable-jpg \ --enable-bmp \ --enable-tif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 9fb10463a..4b390bb6a 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -26,10 +26,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+= libsdl-dev-install - CONFIGURE_ARGS+= --disable-esd \ --disable-oss \ --enable-alsa \ @@ -39,7 +35,7 @@ CONFIGURE_ARGS+= --disable-esd \ --enable-input-tslib \ --with-x -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 5538cdfbd..4c4cb447b 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -23,12 +23,8 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+= uclibc-dev-install - # do nothing, uClibc is already build in toolchain directory -do-install: $(STAGING_TARGET_DIR)/lib/libc.so ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: $(STAGING_TARGET_DIR)/lib/libc.so ${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc # create timezone file test -z $(ADK_RUNTIME_TIMEZONE) || \ diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index e1f4d0dc5..3010e7a92 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -34,13 +34,6 @@ $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_ $(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_MYSQL}+= ulogd-mod-mysql-install -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PGSQL}+= ulogd-mod-pgsql-install -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+= ulogd-mod-sqlite-install -SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+= ulogd-mod-extra-install - TCFLAGS+= -fPIC ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},) @@ -55,7 +48,7 @@ ifneq (${ADK_PACKAGE_ULOGD_MOD_SQLITE},) CONFIGURE_ARGS+= --with-sqlite3=${STAGING_TARGET_DIR}/usr endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/ ${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \ ${IDIR_ULOGD}/usr/lib/ulogd/ -- cgit v1.2.3 From a0ea7c09e9b28bf6571363a2c3542fb03f7b34ae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Jan 2011 17:04:56 +0100 Subject: add varios patches... eglibc should install nsswitch.conf and others. add -fhonour-copts to TARGET_CFLAGS. --- TODO | 6 +- package/ImageMagick/Makefile | 3 +- package/eglibc/Makefile | 5 +- package/gdk-pixbuf/Makefile | 1 + rules.mk | 2 +- toolchain/eglibc/Makefile | 7 +- toolchain/gcc/patches/cflags.patch | 253 +++++++++++++++++++++++++++++++++++++ tools/adk/pkgmaker.c | 18 ++- 8 files changed, 288 insertions(+), 7 deletions(-) create mode 100644 toolchain/gcc/patches/cflags.patch (limited to 'package/eglibc') diff --git a/TODO b/TODO index 256db6783..23caeef0d 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,8 @@ -- rework subinstall logic +- man pages in ipkg/tgz packages (automatic) +- ccache support for speedup +- distcc eval +- GCC SSP evaluation +- LTO GCC evaluation - fix autoreconf usage in opensc - fix timezone stuff in eglibc/glibc - add back aufs2 patches for kernel diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 895b4c001..30a0cb89b 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -35,7 +35,8 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -CONFIGURE_ARGS+= --with-magick-plus-plus=no +CONFIGURE_ARGS+= --with-magick-plus-plus=no \ + --enable-fast-install post-install: $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 50c75b1f2..27dc871bf 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -54,10 +54,13 @@ do-install: $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ $(IDIR_EGLIBC)/etc/localtime $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ - -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc/ + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_EGLIBC}/etc/ + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_EGLIBC}/etc/ eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index f1eedeeb1..b73bc688e 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 2.23.0 PKG_RELEASE:= 2 PKG_MD5SUM:= a7d6c5f2fe2d481149ed3ba807b5c043 PKG_DESCR:= GDK pixbuf library +PKG_BUILDDEP:= jpeg PKG_SECTION:= libs PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/ diff --git a/rules.mk b/rules.mk index 40d98186b..f10be0b86 100644 --- a/rules.mk +++ b/rules.mk @@ -49,7 +49,7 @@ export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH HOSTCPPFLAGS?= HOSTLDFLAGS?= -TARGET_CFLAGS:= $(strip -fno-ident ${TARGET_CFLAGS}) +TARGET_CFLAGS:= $(strip -fno-ident -fhonour-copts ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index a4d54bb69..b007d2e43 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -79,12 +79,15 @@ $(WRKBUILD)/.configured: ); touch $@ -$(WRKBUILD)/.compiled: +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) all touch $@ -$(WRKBUILD)/.installed: +$(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install + ${INSTALL_DATA} ${EGLIBC_BUILD_DIR_FINAL}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/ + ${INSTALL_DATA} ${EGLIBC_BUILD_DIR_FINAL}/libc/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/ + ${INSTALL_DATA} ${EGLIBC_BUILD_DIR_FINAL}/libc/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/ touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/gcc/patches/cflags.patch b/toolchain/gcc/patches/cflags.patch new file mode 100644 index 000000000..0d5815a54 --- /dev/null +++ b/toolchain/gcc/patches/cflags.patch @@ -0,0 +1,253 @@ + + This patch brings over a few features from MirBSD: + * -fhonour-copts + If this option is not given, it's warned (depending + on environment variables). This is to catch errors + of misbuilt packages which override CFLAGS themselves. + * -Werror-maybe-reset + Has the effect of -Wno-error if GCC_NO_WERROR is + set and not '0', a no-operation otherwise. This is + to be able to use -Werror in "make" but prevent + GNU autoconf generated configure scripts from + freaking out. + * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks + the default for -O2/-Os, because they trigger gcc bugs + and can delete code with security implications. + + This patch was authored by Thorsten Glaser + with copyright assignment to the FSF in effect. + +--- a/gcc/c-opts.c ++++ b/gcc/c-opts.c +@@ -105,6 +105,9 @@ + /* Number of deferred options scanned for -include. */ + static size_t include_cursor; + ++/* Check if a port honours COPTS. */ ++static int honour_copts = 0; ++ + static void set_Wimplicit (int); + static void handle_OPT_d (const char *); + static void set_std_cxx98 (int); +@@ -454,6 +457,9 @@ + enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); + break; + ++ case OPT_Werror_maybe_reset: ++ break; ++ + case OPT_Wformat: + set_Wformat (value); + break; +@@ -690,6 +701,12 @@ + flag_exceptions = value; + break; + ++ case OPT_fhonour_copts: ++ if (c_language == clk_c) { ++ honour_copts++; ++ } ++ break; ++ + case OPT_fimplement_inlines: + flag_implement_inlines = value; + break; +@@ -1209,6 +1226,47 @@ + return false; + } + ++ if (c_language == clk_c) { ++ char *ev = getenv ("GCC_HONOUR_COPTS"); ++ int evv; ++ if (ev == NULL) ++ evv = -1; ++ else if ((*ev == '0') || (*ev == '\0')) ++ evv = 0; ++ else if (*ev == '1') ++ evv = 1; ++ else if (*ev == '2') ++ evv = 2; ++ else if (*ev == 's') ++ evv = -1; ++ else { ++ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); ++ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ ++ } ++ if (evv == 1) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in lenient mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ warning (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } else if (evv == 2) { ++ if (honour_copts == 0) { ++ error ("someone does not honour COPTS at all in strict mode"); ++ return false; ++ } else if (honour_copts != 1) { ++ error ("someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ return false; ++ } ++ } else if (evv == 0) { ++ if (honour_copts != 1) ++ inform (0, "someone does not honour COPTS correctly, passed %d times", ++ honour_copts); ++ } ++ } ++ + return true; + } + +--- a/gcc/c.opt ++++ b/gcc/c.opt +@@ -215,6 +215,10 @@ + C ObjC RejectNegative Warning + This switch is deprecated; use -Werror=implicit-function-declaration instead + ++Werror-maybe-reset ++C ObjC C++ ObjC++ ++; Documented in common.opt ++ + Wfloat-equal + C ObjC C++ ObjC++ Var(warn_float_equal) Warning + Warn if testing floating point numbers for equality +@@ -609,6 +613,9 @@ + fhonor-std + C++ ObjC++ + ++fhonour-copts ++C ObjC C++ ObjC++ RejectNegative ++ + fhosted + C ObjC + Assume normal C execution environment +--- a/gcc/common.opt ++++ b/gcc/common.opt +@@ -102,6 +102,10 @@ + Common Joined + Treat specified warning as error + ++Werror-maybe-reset ++Common ++If environment variable GCC_NO_WERROR is set, act as -Wno-error ++ + Wextra + Common Warning + Print extra (possibly unwanted) warnings +@@ -573,6 +577,9 @@ + Common Report Var(flag_guess_branch_prob) Optimization + Enable guessing of branch probabilities + ++fhonour-copts ++Common RejectNegative ++ + ; Nonzero means ignore `#ident' directives. 0 means handle them. + ; Generate position-independent code for executables if possible + ; On SVR4 targets, it also controls whether or not to emit a +--- a/gcc/opts.c ++++ b/gcc/opts.c +@@ -896,8 +896,6 @@ + flag_schedule_insns_after_reload = opt2; + #endif + flag_regmove = opt2; +- flag_strict_aliasing = opt2; +- flag_strict_overflow = opt2; + flag_reorder_blocks = opt2; + flag_reorder_functions = opt2; + flag_tree_vrp = opt2; +@@ -922,6 +919,8 @@ + + /* -O3 optimizations. */ + opt3 = (optimize >= 3); ++ flag_strict_aliasing = opt3; ++ flag_strict_overflow = opt3; + flag_predictive_commoning = opt3; + flag_inline_functions = opt3; + flag_unswitch_loops = opt3; +@@ -1601,6 +1601,17 @@ + enable_warning_as_error (arg, value, lang_mask); + break; + ++ case OPT_Werror_maybe_reset: ++ { ++ char *ev = getenv ("GCC_NO_WERROR"); ++ if ((ev != NULL) && (*ev != '0')) ++ warnings_are_errors = 0; ++ } ++ break; ++ ++ case OPT_fhonour_copts: ++ break; ++ + case OPT_Wlarger_than_: + /* This form corresponds to -Wlarger-than-. + Kept for backward compatibility. +--- a/gcc/doc/cppopts.texi ++++ b/gcc/doc/cppopts.texi +@@ -164,6 +164,11 @@ + Make all warnings into hard errors. Source code which triggers warnings + will be rejected. + ++ at item -Werror-maybe-reset ++ at opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ + @item -Wsystem-headers + @opindex Wsystem-headers + Issue warnings for code in system headers. These are normally unhelpful +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -234,7 +234,7 @@ + -Wconversion -Wcoverage-mismatch -Wno-deprecated @gol + -Wno-deprecated-declarations -Wdisabled-optimization @gol + -Wno-div-by-zero -Wempty-body -Wenum-compare -Wno-endif-labels @gol +--Werror -Werror=* @gol ++-Werror -Werror=* -Werror-maybe-reset @gol + -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol + -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol + -Wformat-security -Wformat-y2k @gol +@@ -4161,6 +4161,22 @@ + @option{-Wall} and by @option{-pedantic}, which can be disabled with + @option{-Wno-pointer-sign}. + ++ at item -Werror-maybe-reset ++ at opindex Werror-maybe-reset ++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment ++variable is set to anything other than 0 or empty. ++ ++ at item -fhonour-copts ++ at opindex fhonour-copts ++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not ++given at least once, and warn if it is given more than once. ++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not ++given exactly once. ++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option ++is not given exactly once. ++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. ++This flag and environment variable only affect the C language. ++ + @item -Wstack-protector + @opindex Wstack-protector + @opindex Wno-stack-protector +@@ -5699,7 +5715,7 @@ + second branch or a point immediately following it, depending on whether + the condition is known to be true or false. + +-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. ++Enabled at levels @option{-O3}. + + @item -fsplit-wide-types + @opindex fsplit-wide-types +--- a/gcc/java/jvspec.c ++++ b/gcc/java/jvspec.c +@@ -670,6 +670,7 @@ + class name. Append dummy `.c' that can be stripped by set_input so %b + is correct. */ + set_input (concat (main_class_name, "main.c", NULL)); ++ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ + err = do_spec (jvgenmain_spec); + if (err == 0) + { diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index cee3f1420..eeba00304 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -1,7 +1,7 @@ /* * pkgmaker - create package meta-data for OpenADK buildsystem * - * Copyright (C) 2010 Waldemar Brodkorb + * Copyright (C) 2010,2011 Waldemar Brodkorb * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -222,6 +222,7 @@ int main() { char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd; char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url; char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi; + char *pkg_need_cxx, *pkg_need_java; char *pkg_host_depends, *pkg_arch_depends, *pkg_flavours, *pkg_choices, *pseudo_name; char *packages, *pkg_name_u, *pkgs; char *saveptr, *p_ptr, *s_ptr; @@ -242,6 +243,8 @@ int main() { pkg_dflt = NULL; pkg_cfline = NULL; pkg_multi = NULL; + pkg_need_cxx = NULL; + pkg_need_java = NULL; p_ptr = NULL; s_ptr = NULL; @@ -351,6 +354,10 @@ int main() { continue; if ((parse_var(buf, "PKG_CXX", NULL, &pkg_cxx)) == 0) continue; + if ((parse_var(buf, "PKG_NEED_CXX", NULL, &pkg_need_cxx)) == 0) + continue; + if ((parse_var(buf, "PKG_NEED_JAVA", NULL, &pkg_need_java)) == 0) + continue; if ((parse_var(buf, "PKG_MULTI", NULL, &pkg_multi)) == 0) continue; if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0) @@ -584,6 +591,13 @@ int main() { pkg_depends = NULL; } + if (pkg_need_cxx != NULL) { + fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_CXX"); + } + if (pkg_need_java != NULL) { + fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_JAVA"); + } + fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name)); if (pkg_dflt != NULL) { @@ -710,6 +724,8 @@ int main() { free(pkg_arch_depends); free(pkg_host_depends); free(pkg_cxx); + free(pkg_need_cxx); + free(pkg_need_java); free(pkg_dflt); free(pkg_cfline); free(pkg_multi); -- cgit v1.2.3 From 1a4fa44b145ef3eaaf96e47adfe8957d56c9b280 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Jan 2011 23:33:37 +0100 Subject: add missing stuff from tg@ --- package/eglibc/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'package/eglibc') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 27dc871bf..e82e3b707 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -49,10 +49,23 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ # compile nothing, eglibc is already build in toolchain directory do-install: ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ - $(IDIR_EGLIBC)/usr/lib - test -z $(ADK_RUNTIME_TIMEZONE) || \ - $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ - $(IDIR_EGLIBC)/etc/localtime + $(IDIR_EGLIBC)/usr/lib + cd ${STAGING_TARGET_DIR} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s usr/share/zoneinfo/"$$f" || continue; \ + echo usr/share/zoneinfo/"$$f" | \ + ${TOOLS_DIR}/cpio -pdu ${IDIR_EGLIBC}/; \ + done + tz=; cd ${IDIR_EGLIBC}/usr/share/zoneinfo || exit 1; \ + for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s "$$f" || continue; \ + tz=$$f; \ + done; if test x"$$tz" = x""; then \ + echo >&2 Error during timezone installation; \ + exit 1; \ + else \ + ln -sf "../usr/share/zoneinfo/$$tz" \ + ${IDIR_EGLIBC}/etc/localtime; \ + fi $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ -- cgit v1.2.3 From a217fc80b29080dae963bb15051df023de36ce39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 10:59:12 +0100 Subject: add LTO support to toolchain settings. Cleanup SYSROOT mess. - just use on sysroot directory for toolchain. - add missing patches from previos commit. (rpath/cflags cleanup) --- TODO | 13 ++++++--- mk/build.mk | 1 + mk/buildhlp.mk | 4 ++- mk/vars.mk | 13 ++++++--- package/ImageMagick/patches/patch-config_ltmain_sh | 30 +++++++++++++++++++++ package/ImageMagick/patches/patch-configure | 20 -------------- package/dbus/patches/patch-configure | 6 ++--- package/dbus/patches/patch-ltmain_sh | 30 +++++++++++++++++++++ package/eglibc/Makefile | 5 ++-- package/fltk/patches/patch-fltk2-config_in | 27 +++++++++++++++++++ package/gettext/Makefile | 3 ++- package/gettext/patches/patch-build-aux_ltmain_sh | 30 +++++++++++++++++++++ package/gnupg/Makefile | 1 + package/irssi/patches/patch-build-aux_ltmain_sh | 30 +++++++++++++++++++++ package/krb5/patches/patch-src_krb5-config_in | 22 +++++++++++++++ package/libelf/Makefile | 11 ++++---- package/opensc/patches/patch-ltmain_sh | 30 +++++++++++++++++++++ package/opensc/patches/patch-src_Makefile_in | 6 ++--- package/rpcbind/patches/patch-ltmain_sh | 30 +++++++++++++++++++++ package/subversion/patches/patch-build_ltmain_sh | 30 +++++++++++++++++++++ target/linux/config/Config.in.netdevice | 1 + toolchain/Config.in | 18 ++++++++++++- toolchain/Makefile | 6 ++--- toolchain/binutils/Makefile | 1 - toolchain/eglibc/Makefile | 12 ++++++--- toolchain/gcc/Makefile | 25 +++++++++-------- toolchain/glibc/Makefile | 11 ++++---- toolchain/glibc/Makefile.inc | 2 +- toolchain/kernel-headers/Makefile | 5 ---- toolchain/libelf/Makefile | 31 ++++++++++++++++++++++ toolchain/libelf/Makefile.inc | 8 ++++++ toolchain/uClibc/Makefile | 18 ++++++++++--- 32 files changed, 402 insertions(+), 78 deletions(-) create mode 100644 package/ImageMagick/patches/patch-config_ltmain_sh delete mode 100644 package/ImageMagick/patches/patch-configure create mode 100644 package/dbus/patches/patch-ltmain_sh create mode 100644 package/fltk/patches/patch-fltk2-config_in create mode 100644 package/gettext/patches/patch-build-aux_ltmain_sh create mode 100644 package/irssi/patches/patch-build-aux_ltmain_sh create mode 100644 package/krb5/patches/patch-src_krb5-config_in create mode 100644 package/opensc/patches/patch-ltmain_sh create mode 100644 package/rpcbind/patches/patch-ltmain_sh create mode 100644 package/subversion/patches/patch-build_ltmain_sh create mode 100644 toolchain/libelf/Makefile create mode 100644 toolchain/libelf/Makefile.inc (limited to 'package/eglibc') diff --git a/TODO b/TODO index 34fed5d18..56959ebbe 100644 --- a/TODO +++ b/TODO @@ -1,20 +1,27 @@ - man pages in ipkg/tgz packages (automatic) +- automatic healing after move of adk directory (pc,la) - ccache support for speedup -- distcc eval +- distcc evaluation - GCC SSP evaluation - LTO GCC evaluation +- finish qemu package - fix autoreconf usage in opensc -- fix timezone stuff in eglibc/glibc +- fix timezone stuff in glibc - add back aufs2 patches for kernel - openssl ocf support check +- locales support - new package minidlna - wget/curl/ftp download support - fix heimdal package +- fix or remove bazaar package - check all patches for CFLAGS compliance, fhonour patch from FreeWRT +- rpath cleanup - busybox update and SuSv3 removal - check rtc support on foxg20 - adkinstall with NTP and hwclock support - PKG_CONFLICTS for python/python2, is this possible with Kconfig? - mirror only option, for no internet access -- add support for brcm 2.6 (lzma/flash/wireless support) +- add and test brcm 2.6 wireless support - help text for config/ needs adoption +- diet libc / klibc / newlib support +- pcc support? clang+llvm diff --git a/mk/build.mk b/mk/build.mk index 9f1841cc2..7c8a697f8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -554,6 +554,7 @@ bulkallmod: done ${TOPDIR}/bin/tools/pkgmaker: + @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c ${TOPDIR}/bin/tools/pkgrebuild: diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index c7c598de3..2cb4f1714 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -24,9 +24,11 @@ else _CHECKSUM_COOKIE= endif -post-extract: +${PACKAGE_DIR}/.stamps: @mkdir -p ${PACKAGE_DIR}/.stamps +post-extract: ${PACKAGE_DIR}/.stamps + ifeq ($(strip ${NO_DISTFILES}),1) ${WRKDIST}/.extract_done: rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD} diff --git a/mk/vars.mk b/mk/vars.mk index 37461e981..7828347d5 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -9,14 +9,23 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) + +# target compiler settings +TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include +TARGET_LDFLAGS+= -Wl,-O2 ifneq ($(ADK_DEBUG),) TARGET_DEBUGGING:= -g3 -fno-omit-frame-pointer else -TARGET_DEBUGGING:= -fomit-frame-pointer $(TARGET_OPTIMIZATION) +TARGET_DEBUGGING:= $(TARGET_OPTIMIZATION) -fomit-frame-pointer endif TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) TARGET_CFLAGS+= -fstack-protector +TARGET_LDFLAGS+= -fstack-protector +endif +ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),) +TARGET_CFLAGS+= -flto +TARGET_LDFLAGS+= -flto endif BASE_DIR:= $(TOPDIR) @@ -56,8 +65,6 @@ endif TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld -TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include -TARGET_LDFLAGS+= -Wl,-O2 PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux diff --git a/package/ImageMagick/patches/patch-config_ltmain_sh b/package/ImageMagick/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..3c1be111b --- /dev/null +++ b/package/ImageMagick/patches/patch-config_ltmain_sh @@ -0,0 +1,30 @@ +--- ImageMagick-6.6.5-10.orig/config/ltmain.sh 2010-11-21 22:35:22.000000000 +0100 ++++ ImageMagick-6.6.5-10/config/ltmain.sh 2011-01-08 23:20:33.000000000 +0100 +@@ -5843,27 +5843,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/ImageMagick/patches/patch-configure b/package/ImageMagick/patches/patch-configure deleted file mode 100644 index 717f612ea..000000000 --- a/package/ImageMagick/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- ImageMagick-6.6.5-10.orig/configure 2010-11-21 22:36:46.000000000 +0100 -+++ ImageMagick-6.6.5-10/configure 2011-01-07 00:03:54.000000000 +0100 -@@ -14824,7 +14824,7 @@ fi - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. -- hardcode_into_libs=yes -+ hardcode_into_libs=no - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -@@ -18491,7 +18491,7 @@ fi - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. -- hardcode_into_libs=yes -+ hardcode_into_libs=no - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure index f33a192a9..85521d390 100644 --- a/package/dbus/patches/patch-configure +++ b/package/dbus/patches/patch-configure @@ -1,6 +1,6 @@ ---- dbus-1.2.16.orig/configure 2009-07-14 21:43:08.000000000 +0200 -+++ dbus-1.2.16/configure 2010-01-15 19:03:24.000000000 +0100 -@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then +--- dbus-1.2.24.orig/configure 2010-03-23 20:11:22.000000000 +0100 ++++ dbus-1.2.24/configure 2011-01-08 22:50:31.000000000 +0100 +@@ -25294,19 +25296,6 @@ if test "x$GCC" = "xyes"; then ;; esac diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh new file mode 100644 index 000000000..b63e1d647 --- /dev/null +++ b/package/dbus/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- dbus-1.2.24.orig/ltmain.sh 2010-03-12 23:22:29.000000000 +0100 ++++ dbus-1.2.24/ltmain.sh 2011-01-08 22:57:14.000000000 +0100 +@@ -5516,27 +5516,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index e82e3b707..844b49876 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -20,10 +20,9 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -EGLIBC_CONFOPTS:= \ - --build=$(GNU_HOST_NAME) \ +EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-nls \ --without-cvs \ --disable-profile \ diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in new file mode 100644 index 000000000..c4784688a --- /dev/null +++ b/package/fltk/patches/patch-fltk2-config_in @@ -0,0 +1,27 @@ +--- fltk-2.0.x-r7513.orig/fltk2-config.in 2006-04-15 19:43:12.000000000 +0200 ++++ fltk-2.0.x-r7513/fltk2-config.in 2011-01-08 23:34:40.000000000 +0100 +@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@" + # libraries to link with: + LIBNAME="@LIBNAME@" + DSONAME="@DSONAME@" +-DSOLINK="@DSOLINK@" + IMAGELIBS="@IMAGELIBS@" + SHAREDSUFFIX="@SHAREDSUFFIX@" + +@@ -168,7 +167,6 @@ do + bindir=${exec_prefix} + includedir=${prefix}/include + libdir=${prefix}/lib +- DSOLINK="-Wl,-rpath,${prefix}/lib" + ;; + --prefix) + echo_prefix=yes +@@ -283,7 +281,7 @@ if test x$use_images = xyes; then + LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS" + fi + +-LDLIBS="$DSOLINK $LDLIBS" ++LDLIBS="$LDLIBS" + LDSTATIC="$LDSTATIC_PATHS $LDSTATIC" + + # Answer to user requests diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 76e73fed0..76d47acd5 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -18,7 +18,7 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime +WRKSRC= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime include ${TOPDIR}/mk/package.mk @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --disable-java \ --disable-csharp \ --enable-nls \ --disable-libasprintf \ + --disable-rpath \ --enable-threads=posix \ --disable-openmp \ --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \ diff --git a/package/gettext/patches/patch-build-aux_ltmain_sh b/package/gettext/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..9141bd704 --- /dev/null +++ b/package/gettext/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,30 @@ +--- gettext-0.18.1.1.orig/build-aux/ltmain.sh 2010-06-06 14:49:57.000000000 +0200 ++++ gettext-0.18.1.1/build-aux/ltmain.sh 2011-01-08 23:49:55.000000000 +0100 +@@ -5652,27 +5652,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile index ff3739775..d28b2b4dc 100644 --- a/package/gnupg/Makefile +++ b/package/gnupg/Makefile @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --disable-asm \ --disable-finger \ --disable-ftp \ --disable-dns-srv \ + --disable-rpath \ --enable-fake-curl \ --disable-regex diff --git a/package/irssi/patches/patch-build-aux_ltmain_sh b/package/irssi/patches/patch-build-aux_ltmain_sh new file mode 100644 index 000000000..05bcb0e77 --- /dev/null +++ b/package/irssi/patches/patch-build-aux_ltmain_sh @@ -0,0 +1,30 @@ +--- irssi-0.8.15.orig/build-aux/ltmain.sh 2010-04-03 18:21:23.000000000 +0200 ++++ irssi-0.8.15/build-aux/ltmain.sh 2011-01-09 00:18:54.000000000 +0100 +@@ -5516,27 +5516,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in new file mode 100644 index 000000000..ddc0159a6 --- /dev/null +++ b/package/krb5/patches/patch-src_krb5-config_in @@ -0,0 +1,22 @@ +--- krb5-1.8.1.orig/src/krb5-config.in 2010-01-21 23:49:01.000000000 +0100 ++++ krb5-1.8.1/src/krb5-config.in 2011-01-09 01:33:14.000000000 +0100 +@@ -34,8 +34,6 @@ libdir=@libdir@ + CC_LINK='@CC_LINK@' + KDB5_DB_LIB=@KDB5_DB_LIB@ + LDFLAGS='@LDFLAGS@' +-RPATH_FLAG='@RPATH_FLAG@' +-PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@' + PTHREAD_CFLAGS='@PTHREAD_CFLAGS@' + DL_LIB='@DL_LIB@' + +@@ -180,10 +178,7 @@ if test -n "$do_libs"; then + # Ugly gross hack for our build tree + lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ + -e 's/\$(PURE)//' \ +- -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \ +- -e 's#\$(PROG_RPATH)#'$libdir'#' \ + -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ +- -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ + -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` diff --git a/package/libelf/Makefile b/package/libelf/Makefile index a5847bc87..c8ae86b32 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -2,18 +2,17 @@ # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk +include ${TOPDIR}/toolchain/libelf/Makefile.inc -PKG_NAME:= libelf -PKG_VERSION:= 0.8.11 -PKG_RELEASE:= 1 -PKG_MD5SUM:= e931910b6d100f6caa32239849947fbf PKG_DESCR:= elf library PKG_SECTION:= libs PKG_SITES:= http://www.mr511.de/software/ +PKG_SUBPKGS:= LIBELF + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBELF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= mr_cv_target_elf=yes \ ac_cv_sizeof_long_long=8 @@ -21,7 +20,7 @@ CONFIGURE_ARGS+= --enable-elf64=yes \ --disable-sanity-checks FAKE_FLAGS+= instroot="${WRKINST}" -post-install: +libelf-install: ${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib ${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/ diff --git a/package/opensc/patches/patch-ltmain_sh b/package/opensc/patches/patch-ltmain_sh new file mode 100644 index 000000000..e36389c67 --- /dev/null +++ b/package/opensc/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- opensc-0.11.13.orig/ltmain.sh 2011-01-09 00:58:43.000000000 +0100 ++++ opensc-0.11.13/ltmain.sh 2011-01-09 00:57:54.000000000 +0100 +@@ -6635,27 +6635,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) func_append compile_rpath " $absdir" ;; +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) func_append finalize_rpath " $libdir" ;; +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/opensc/patches/patch-src_Makefile_in b/package/opensc/patches/patch-src_Makefile_in index 63d41a20e..f2891678f 100644 --- a/package/opensc/patches/patch-src_Makefile_in +++ b/package/opensc/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- opensc-0.11.13.orig/src/Makefile.in 2010-02-16 10:32:17.000000000 +0100 -+++ opensc-0.11.13/src/Makefile.in 2010-12-15 21:48:57.000000000 +0100 -@@ -260,8 +260,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil +--- opensc-0.11.13.orig/src/Makefile.in 2011-01-09 00:58:50.000000000 +0100 ++++ opensc-0.11.13/src/Makefile.in 2011-01-09 00:56:00.000000000 +0100 +@@ -263,8 +263,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil EXTRA_DIST = Makefile.mak # Order IS important diff --git a/package/rpcbind/patches/patch-ltmain_sh b/package/rpcbind/patches/patch-ltmain_sh new file mode 100644 index 000000000..1f5fa84b7 --- /dev/null +++ b/package/rpcbind/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- rpcbind-0.2.0.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 ++++ rpcbind-0.2.0/ltmain.sh 2011-01-09 00:48:19.000000000 +0100 +@@ -2561,27 +2561,6 @@ EOF + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/subversion/patches/patch-build_ltmain_sh b/package/subversion/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..b9315f8b3 --- /dev/null +++ b/package/subversion/patches/patch-build_ltmain_sh @@ -0,0 +1,30 @@ +--- subversion-1.6.12.orig/build/ltmain.sh 2010-03-31 20:37:12.000000000 +0200 ++++ subversion-1.6.12/build/ltmain.sh 2011-01-09 01:50:49.000000000 +0100 +@@ -2561,27 +2561,6 @@ EOF + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 40573a78f..e7ff2be99 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -319,6 +319,7 @@ config ADK_KPACKAGE_KMOD_B43 tristate select ADK_KPACKAGE_KMOD_FW_LOADER depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI + default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G default n help Driver for Broadcom B43xx wireless chips. diff --git a/toolchain/Config.in b/toolchain/Config.in index b85fd6056..06f0c468a 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -15,6 +15,11 @@ config ADK_TOOLCHAIN_GCC_JAVA boolean default n +config ADK_TOOLCHAIN_GCC_OBJC + prompt "Enable building of Objective C compiler" + boolean + default n + config ADK_TOOLCHAIN_GCC_SSP prompt "Enable Stack Smashing Protection in GCC" boolean @@ -25,5 +30,16 @@ config ADK_TOOLCHAIN_GCC_USE_SSP boolean depends on ADK_TOOLCHAIN_GCC_SSP default n - + +config ADK_TOOLCHAIN_GCC_LTO + prompt "Enable Link Time Optimization in GCC" + boolean + default n + +config ADK_TOOLCHAIN_GCC_USE_LTO + prompt "Use Link Time Optimization for all packages" + boolean + depends on ADK_TOOLCHAIN_GCC_LTO + default n + endmenu diff --git a/toolchain/Makefile b/toolchain/Makefile index 34bd57210..e3c04a85a 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -3,7 +3,7 @@ # # Steps to build toolchains # 1) build and install binutils -# 2) build and install mpfr, mpc and gmp +# 2) build and install mpfr, mpc, libelf and gmp # 3) build and install gcc c compiler # 4) install kernel-headers # 5) install libc headers @@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk -TARGETS:=binutils gmp mpfr mpc gcc +TARGETS:=binutils gmp mpfr mpc libelf gcc ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGETS+=glibc-ports glibc LIBC:=glibc @@ -38,7 +38,7 @@ install: $(TARGETS_INSTALL) clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) -gcc-prepare: binutils-install gmp-install mpfr-install mpc-install +gcc-prepare: binutils-install gmp-install mpfr-install mpc-install libelf-install ifeq ($(ADK_TARGET_LIB_GLIBC),y) $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare else diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 2b0137db9..cc8c1b26a 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -28,7 +28,6 @@ $(WRKBUILD)/.configured: --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ --with-sysroot=$(STAGING_TARGET_DIR) \ --disable-multilib \ --disable-dependency-tracking \ diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 2db3fa6f6..c5f2a5653 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -50,8 +50,8 @@ $(WRKBUILD)/.headers_configure: (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ $(WRKBUILD)/libc/configure \ - --prefix=$(TOOLCHAIN_SYSROOT)/usr \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --prefix=$(STAGING_TARGET_DIR)/usr \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ ${EGLIBC_CONFOPTS} \ ); touch $@ @@ -61,9 +61,15 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure PATH='${TARGET_PATH}' \ $(MAKE) install-headers install-bootstrap-headers=yes \ ); - touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $@ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +EGLIBC_ENV+= libc_cv_ssp=yes +else +EGLIBC_ENV+= libc_cv_ssp=no +endif + $(WRKBUILD)/.configured: mkdir -p $(EGLIBC_BUILD_DIR_FINAL) $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b881473de..afb945000 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -11,6 +11,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \ --target=$(REAL_GNU_TARGET_NAME) \ --with-gmp=$(STAGING_HOST_DIR) \ --with-mpfr=$(STAGING_HOST_DIR) \ + --with-libelf=$(STAGING_HOST_DIR) \ --disable-__cxa_atexit \ --with-gnu-ld \ --disable-libmudflap \ @@ -32,6 +33,12 @@ else GCC_CONFOPTS+= --disable-libssp endif +ifeq ($(ADK_TOOLCHAIN_GCC_LTO),y) +GCC_CONFOPTS+= --enable-lto +else +GCC_CONFOPTS+= --disable-lto +endif + ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else @@ -67,6 +74,9 @@ endif ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y) LANGUAGES:=${LANGUAGES},java endif +ifeq ($(ADK_TOOLCHAIN_GCC_ADA),y) +LANGUAGES:=${LANGUAGES},ada +endif include ${TOPDIR}/mk/buildhlp.mk @@ -76,7 +86,7 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) - (cd $(GCC_BUILD_DIR_MINIMAL); rm -f config.cache; \ + (cd $(GCC_BUILD_DIR_MINIMAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ @@ -98,12 +108,8 @@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled touch $@ $(GCC_BUILD_DIR_INITIAL)/.configured: - rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib - ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib mkdir -p $(GCC_BUILD_DIR_INITIAL) - (cd $(GCC_BUILD_DIR_INITIAL); rm -f config.cache; \ + (cd $(GCC_BUILD_DIR_INITIAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ @@ -111,7 +117,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: --disable-shared \ --disable-threads \ --with-newlib \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ + --with-sysroot=$(STAGING_TARGET_DIR) \ ); touch $@ @@ -128,7 +134,7 @@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled $(GCC_BUILD_DIR_FINAL)/.configured: mkdir -p $(GCC_BUILD_DIR_FINAL) - (cd $(GCC_BUILD_DIR_FINAL); rm -f config.cache; \ + (cd $(GCC_BUILD_DIR_FINAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ @@ -146,9 +152,6 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install - # workaround if you cross-compile binutils - @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a - @-rm $(STAGING_TARGET_DIR)/usr/lib/libiberty.a # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_HOST_DIR); \ diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 4d39e2b27..96dc99302 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -31,21 +31,21 @@ $(WRKBUILD)/.headers_configure: (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ - --prefix=$(TOOLCHAIN_SYSROOT)/usr \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ + --prefix=$(STAGING_TARGET_DIR)/usr \ + --with-sysroot=$(STAGING_TARGET_DIR) \ ${GLIBC_CONFOPTS} \ ); touch $@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure - mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib + mkdir -p $(STAGING_TARGET_DIR)/usr/lib (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(MAKE) ${GLIBC_MAKEOPTS} \ cross-compiling=yes \ install-headers \ ); - touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $@ $(WRKBUILD)/.configured: @@ -67,7 +67,6 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.installed: ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \ install_root=$(STAGING_TARGET_DIR) install - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(WRKBUILD)/.installed + touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index ff4753465..d7bcecb13 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -9,7 +9,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_PORTS_VERSION:= 2.12 GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-nls \ --disable-sanity-checks \ --disable-nls \ diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 45160fab1..81c2b6593 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -10,9 +10,6 @@ $(WRKBUILD)/.headers: $(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ headers_install - $(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ - INSTALL_HDR_PATH=$(TOOLCHAIN_SYSROOT)/usr \ - headers_install $(MAKE) -C $(WRKBUILD) HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \ headers_install @@ -22,10 +19,8 @@ $(WRKBUILD)/.headers: ifeq ($(ARCH),cris) ifeq ($(CPU_ARCH),crisv32) cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v32/arch arch - cd $(TOOLCHAIN_SYSROOT)/usr/include && ln -sf arch-v32/arch arch else cd $(STAGING_TARGET_DIR)/usr/include && ln -sf arch-v10/arch arch - cd $(TOOLCHAIN_SYSROOT)/usr/include && ln -sf arch-v10/arch arch endif endif touch $@ diff --git a/toolchain/libelf/Makefile b/toolchain/libelf/Makefile new file mode 100644 index 000000000..485978cf0 --- /dev/null +++ b/toolchain/libelf/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk +include Makefile.inc +include ../rules.mk +include ${TOPDIR}/mk/buildhlp.mk + +ifeq (${ADK_MAKE_PARALLEL},y) +LIBELF_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: + (cd $(WRKBUILD); \ + $(WRKBUILD)/configure \ + --prefix=$(STAGING_HOST_DIR) \ + --disable-shared \ + --enable-static \ + ); + touch $@ + +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured + $(MAKE) ${LIBELF_MAKEOPTS} -C $(WRKBUILD) all + touch $@ + +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled + $(MAKE) -C $(WRKBUILD) install + touch $@ + +include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/libelf/Makefile.inc b/toolchain/libelf/Makefile.inc new file mode 100644 index 000000000..66ca9fd2c --- /dev/null +++ b/toolchain/libelf/Makefile.inc @@ -0,0 +1,8 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +PKG_NAME:= libelf +PKG_VERSION:= 0.8.13 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4136d7b4c04df68b686570afa26988ac +PKG_SITES:= http://www.mr511.de/software/ diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index e04985dac..cc63b9e5f 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -14,18 +14,28 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak - sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ + sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ $(TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif -ifneq ($(ADK_TOOLCHAIN_GCC_SSP),) +ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) $(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config + echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config + echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config + echo "UCLIBC_BUILD_SSP=y" >> ${WRKBUILD}/.config endif + echo N|$(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PREFIX=$(STAGING_TARGET_DIR) \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ + HOSTCC="$(HOSTCC)" \ + CPU_CFLAGS="$(TARGET_CFLAGS)" \ + oldconfig $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ - PREFIX=$(TOOLCHAIN_SYSROOT) \ + PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT) \ + RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ HOSTCC="$(HOSTCC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ install_headers -- cgit v1.2.3