diff options
Diffstat (limited to 'package')
43 files changed, 85 insertions, 84 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile index 625853bd8..b5b7d86b9 100644 --- a/package/ant/Makefile +++ b/package/ant/Makefile @@ -11,6 +11,8 @@ PKG_DESCR:= ant utility PKG_SECTION:= lang PKG_SITES:= http://archive.apache.org/dist/ant/source/ +PKG_CFLINE_ANT:= depends on ADK_HOST_ONLY + DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 3df9a52bf..8cb3f1f37 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -20,10 +20,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --without-berkeley-db \ - --with-apr=${STAGING_DIR}/usr \ + --with-apr=${STAGING_TARGET_DIR}/usr \ --with-expat=${STAGING_TARGET_DIR}/usr -XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build-1 \ - apr_builders=${STAGING_DIR}/usr/share/build-1 +XAKE_FLAGS+= apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \ + apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1 apr-util-install: ${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib diff --git a/package/apr/Makefile b/package/apr/Makefile index ba53c9c92..3a6524c58 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -42,15 +42,15 @@ endif pre-build: # we need to patch paths to get apr-util compiling - $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ ${WRKBUILD}/apr-1-config - $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ ${WRKBUILD}/apr-1-config apr-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib ${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/ - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 - ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/ + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1 + ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a298d108b..f320d6b82 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 67 +PKG_RELEASE:= 68 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index b859d1d89..8daf52b89 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -5,7 +5,9 @@ . /etc/functions.sh # disable kernel messages -echo 0 > /proc/sys/kernel/printk +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi # remount /dev with smaller size mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index e19ddcc9c..e6405bf38 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -31,9 +31,9 @@ bcm2835-vc-install: $(CP) ${WRKINST}/opt/vc/bin/* ${IDIR_BCM2835_VC}/opt/vc/bin # required for xbmc (cd ${IDIR_BCM2835_VC}/opt/vc/lib && ln -sf libEGL.so libEGL.so.1) - -rm -rf ${STAGING_DIR}/opt/vc - mkdir -p ${STAGING_DIR}/opt/vc - ${CP} ${WRKINST}/opt/vc/lib ${STAGING_DIR}/opt/vc - ${CP} ${WRKINST}/opt/vc/include ${STAGING_DIR}/opt/vc + -rm -rf ${STAGING_TARGET_DIR}/opt/vc + mkdir -p ${STAGING_TARGET_DIR}/opt/vc + ${CP} ${WRKINST}/opt/vc/lib ${STAGING_TARGET_DIR}/opt/vc + ${CP} ${WRKINST}/opt/vc/include ${STAGING_TARGET_DIR}/opt/vc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/boost/Makefile b/package/boost/Makefile index 2951c1e8c..a2a92df00 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -57,7 +57,7 @@ CONFIGURE_ARGS += \ CONFIGURE_ARGS+=--without-locale ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},) - CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib + CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_TARGET_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_TARGET_DIR}/usr/lib else CONFIGURE_ARGS += --without-iostreams endif diff --git a/package/classpath/Makefile b/package/classpath/Makefile index 3d2166c60..dd983288e 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -44,9 +44,9 @@ classpath-install: $(CP) $(WRKINST)/usr/lib/classpath/lib*so.* \ $(IDIR_CLASSPATH)/usr/lib/classpath # install to staging directory - $(INSTALL_DIR) $(STAGING_DIR)/usr/share/classpath + $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/share/classpath $(CP) $(WRKINST)/usr/share/classpath/glibj.zip \ - $(STAGING_DIR)/usr/share/classpath + $(STAGING_TARGET_DIR)/usr/share/classpath include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cmake/Makefile b/package/cmake/Makefile index 6cdf53b0b..c444eba19 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -12,13 +12,12 @@ PKG_SECTION:= lang PKG_URL:= http://www.cmake.org/ PKG_SITES:= http://www.cmake.org/files/v2.8/ -PKG_CFLINE_CMAKE:= depends on ADK_BROKEN +PKG_CFLINE_CMAKE:= depends on ADK_HOST_ONLY include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_STYLE:= manual CONFIG_STYLE:= manual @@ -35,13 +34,5 @@ cmake-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/bin/cmake \ $(STAGING_HOST_DIR)/usr/bin -do-configure: - (cd $(WRKBUILD); ./configure --prefix=/usr) - -cmake-install: - $(INSTALL_DIR) $(IDIR_CMAKE)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/cmake \ - $(IDIR_CMAKE)/usr/bin - include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index 89bb7b895..1341e8c5b 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc $(eval $(call PKG_template,CONNTRACK_TOOLS,conntrack-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/corosync/Makefile b/package/corosync/Makefile index 633d32884..efb99a11a 100644 --- a/package/corosync/Makefile +++ b/package/corosync/Makefile @@ -23,8 +23,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,COROSYNC,corosync,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= GCC_HONOUR_COPTS=s -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/nss \ - -I$(STAGING_DIR)/usr/include/nspr +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/nss \ + -I$(STAGING_TARGET_DIR)/usr/include/nspr TARGET_LDFLAGS+= -lssl3 -lsmime3 -lnss3 -lnssutil3 CONFIGURE_ENV+= ac_cv_func_fnmatch_works=yes diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 31596f56d..6a84890dd 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -47,9 +47,9 @@ CONFIGURE_ARGS+= --disable-tests \ CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no pre-install: - ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus + ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ - $(STAGING_DIR)/usr/include/dbus-1.0/dbus + $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus libdbus-install: ${INSTALL_DIR} ${IDIR_LIBDBUS}/usr/lib diff --git a/package/drbd/Makefile b/package/drbd/Makefile index f7de4f0a0..1e1308b3b 100644 --- a/package/drbd/Makefile +++ b/package/drbd/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= GENETLINK_H=$(STAGING_DIR)/usr/include/linux/genetlink.h +XAKE_FLAGS+= GENETLINK_H=$(STAGING_TARGET_DIR)/usr/include/linux/genetlink.h CONFIGURE_ARGS+= --with-distro=generic \ --with-pacemaker \ --without-heartbeat \ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 4b7342197..391d3475b 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath \ --disable-defrag INSTALL_TARGET+= install-libs TARGET_LDFLAGS+= -lpthread -TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include +TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \ BUILD_CFLAGS="${CFLAGS_FOR_BUILD}" \ BUILD_LDFLAGS="${LDFLAGS_FOR_BUILD}" \ diff --git a/package/ecj/Makefile b/package/ecj/Makefile index 8e4dc6f94..8bba31865 100644 --- a/package/ecj/Makefile +++ b/package/ecj/Makefile @@ -10,6 +10,8 @@ PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1 PKG_DESCR:= ecj java compiler PKG_SECTION:= lang +PKG_CFLINE_ECJ:= depends on ADK_HOST_ONLY + NO_DISTFILES:= 1 include $(TOPDIR)/mk/host.mk diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile index 0f4c1a50c..fe73820fa 100644 --- a/package/fastjar/Makefile +++ b/package/fastjar/Makefile @@ -11,6 +11,8 @@ PKG_DESCR:= fastjar utility PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fastjar/} +PKG_CFLINE_FASTJAR:= depends on ADK_HOST_ONLY + include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk diff --git a/package/font-util/Makefile b/package/font-util/Makefile index fb1d6070c..e61808321 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -22,9 +22,9 @@ $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${P # calling pkg-config (which we don't provide) in order to # automatically find the mappings. post-build: - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util ${CP} ${WRKBUILD}/map-* \ - ${STAGING_DIR}/usr/share/fonts/X11/util + ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util font-util-install: ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin diff --git a/package/gcj/Makefile b/package/gcj/Makefile index 15c56b204..8273f06b2 100644 --- a/package/gcj/Makefile +++ b/package/gcj/Makefile @@ -11,6 +11,8 @@ PKG_DESCR:= GNU java compiler PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} +PKG_CFLINE_GCJ:= depends on ADK_HOST_ONLY + DISTFILES:= gcc-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 8128e8bd5..d8b9a26bd 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -36,13 +36,13 @@ XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}' XAKE_FLAGS+= GCC_HONOUR_COPTS:=s post-extract: - -mv $(STAGING_DIR)/usr/lib/libiberty.a $(STAGING_DIR)/usr/lib/libiberty.a.bak + -mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak gdb-install: ${INSTALL_DIR} ${IDIR_GDB}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/ # shipped libbfd conflicts with system wide one rm -f ${WRKINST}/usr/lib/libbfd* - -mv $(STAGING_DIR)/usr/lib/libiberty.a.bak $(STAGING_DIR)/usr/lib/libiberty.a + -mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak $(STAGING_TARGET_DIR)/usr/lib/libiberty.a include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index d6373de34..0b8d3aa7a 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -34,7 +34,7 @@ $(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELE CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/libnl3 +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libnl3 do-configure: ${CP} ./files/hostapd.config ${WRKBUILD}/.config diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index 1f992de47..2e5d63745 100644 --- a/package/ipvsadm/Makefile +++ b/package/ipvsadm/Makefile @@ -17,7 +17,7 @@ PKG_NOPARALLEL:= 1 include $(TOPDIR)/mk/package.mk -TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/libnl3 -fPIC -DHAVE_NL=0 +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libnl3 -fPIC -DHAVE_NL=0 CONFIG_STYLE:= manual XAKE_FLAGS+= HAVE_NL=0 diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile index 558264ce6..58a47af58 100644 --- a/package/libmicrohttpd/Makefile +++ b/package/libmicrohttpd/Makefile @@ -19,7 +19,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_DIR)/usr +CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_TARGET_DIR)/usr libmicrohttpd-install: $(INSTALL_DIR) $(IDIR_LIBMICROHTTPD)/usr/lib diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 511f62b69..5cd8ea8bc 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) AUTOTOOL_STYLE:= autoreconf -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc TARGET_LDFLAGS+= -ltirpc librpcsecgss-install: diff --git a/package/lsof/Makefile b/package/lsof/Makefile index 6415703fc..478d63a17 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -27,7 +27,7 @@ $(eval $(call PKG_template,LSOF,lsof,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS CONFIG_STYLE:= minimal CONFIGURE_PROG:= Configure CONFIGURE_ARGS:= -n linux -XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc' +XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_TARGET_DIR)/usr/include/tirpc' XAKE_FLAGS+= CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc' INSTALL_STYLE:= manual diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index 98d09ea39..696f8901b 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -25,13 +25,13 @@ $(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${P CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \ - -I$(STAGING_DIR)/usr/include/freetype2 \ - -I$(STAGING_DIR)/usr/include/dbus-1.0 \ - -I$(STAGING_DIR)/opt/vc/include \ - -I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux -TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \ + -I$(STAGING_TARGET_DIR)/usr/include/freetype2 \ + -I$(STAGING_TARGET_DIR)/usr/include/dbus-1.0 \ + -I$(STAGING_TARGET_DIR)/opt/vc/include \ + -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \ + -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux +TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/opt/vc/lib omxplayer-install: $(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index b86680a7b..8376e715a 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -89,9 +89,9 @@ CONFIGURE_ARGS+= --disable-bootstrap CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \ - ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \ - ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ - ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ + ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \ + ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ + ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \ diff --git a/package/openssh/Makefile b/package/openssh/Makefile index a56ee80de..409e63c0a 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y) CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" -TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal +TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal endif ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 027a74611..17ec4771e 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -57,8 +57,8 @@ CONFIG:= linux-embedded endif post-extract: - -mkdir -p $(STAGING_DIR)/usr/include/crypto - cp ./files/cryptodev.h $(STAGING_DIR)/usr/include/crypto/ + -mkdir -p $(STAGING_TARGET_DIR)/usr/include/crypto + cp ./files/cryptodev.h $(STAGING_TARGET_DIR)/usr/include/crypto/ do-configure: (cd $(WRKBUILD); \ diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 46da045d1..4f656ea59 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -41,8 +41,8 @@ orbit2-install: $(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \ $(IDIR_ORBIT2)/usr/lib - $(INSTALL_DIR) $(STAGING_DIR)/usr/bin + $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/bin $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \ - $(STAGING_DIR)/usr/bin + $(STAGING_TARGET_DIR)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile index 4fae950ca..a4959fe06 100644 --- a/package/pacemaker-mgmt/Makefile +++ b/package/pacemaker-mgmt/Makefile @@ -27,9 +27,9 @@ CONFIGURE_ARGS+= --with-initdir=/etc/init.d \ --with-ocf-root=/usr/lib/ocf \ --without-ais-support \ --disable-fatal-warnings -TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/python2.7 \ - -I$(STAGING_DIR)/usr/include/pacemaker \ - -I$(STAGING_DIR)/usr/include/heartbeat +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/python2.7 \ + -I$(STAGING_TARGET_DIR)/usr/include/pacemaker \ + -I$(STAGING_TARGET_DIR)/usr/include/heartbeat pacemaker-mgmt-install: $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMT)/usr/lib diff --git a/package/postfix/Makefile b/package/postfix/Makefile index 7e27207c4..e95cc4c9c 100644 --- a/package/postfix/Makefile +++ b/package/postfix/Makefile @@ -25,7 +25,7 @@ ALL_TARGET:= INSTALL_STYLE:= manual do-configure: - (cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DNO_PCRE -DNO_NIS -DNO_DB -DHAS_CDB -I$(STAGING_DIR)/usr/include" "AUXLIBS=$(STAGING_DIR)/usr/lib/libcdb.a") + (cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DNO_PCRE -DNO_NIS -DNO_DB -DHAS_CDB -I$(STAGING_TARGET_DIR)/usr/include" "AUXLIBS=$(STAGING_TARGET_DIR)/usr/lib/libcdb.a") postfix-install: $(INSTALL_DIR) $(IDIR_POSTFIX)/etc/postfix diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile index 899bb3ddb..827693423 100644 --- a/package/pycurl/Makefile +++ b/package/pycurl/Makefile @@ -25,7 +25,7 @@ INSTALL_STYLE:= manual XAKE_FLAGS+= GCC_HONOUR_COPTS=s TARGET_CFLAGS+= -fPIC MAKE_ENV+= LDSHARED="$(TARGET_CC) -shared" -CURL_CONFIG:= $(STAGING_DIR)/usr/bin/curl-config +CURL_CONFIG:= $(STAGING_TARGET_DIR)/usr/bin/curl-config include $(TOPDIR)/mk/python.mk diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile index 4a332b32e..bb6fc15a6 100644 --- a/package/ruby-ldap/Makefile +++ b/package/ruby-ldap/Makefile @@ -26,19 +26,19 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= DESTDIR="/" do-configure: - (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \ + (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_TARGET_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \ --with-openldap2 \ --without-libnsl \ - --with-ldap-dir=$(STAGING_DIR)/usr \ - --with-ldap-lib=$(STAGING_DIR)/usr/lib \ - --with-ldap-include=$(STAGING_DIR)/usr/include) + --with-ldap-dir=$(STAGING_TARGET_DIR)/usr \ + --with-ldap-lib=$(STAGING_TARGET_DIR)/usr/lib \ + --with-ldap-include=$(STAGING_TARGET_DIR)/usr/include) ruby-ldap-install: $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap - $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \ + $(CP) $(STAGING_TARGET_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \ $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux - $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \ + $(CP) $(STAGING_TARGET_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \ $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/scons/Makefile b/package/scons/Makefile index 3f8958d40..9e92c9917 100644 --- a/package/scons/Makefile +++ b/package/scons/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP:= bzip2-host python2-host PKG_URL:= http://www.scons.org PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=scons/} -PKG_ARCH_DEPENDS:= native +PKG_CFLINE_SCONS:= depends on ADK_HOST_ONLY include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk diff --git a/package/snort/Makefile b/package/snort/Makefile index 4427a1297..7fdd18c51 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc TARGET_LDFLAGS+= -ltirpc CONFIGURE_ARGS+= --disable-static-daq \ --with-libpcap-includes="${STAGING_TARGET_DIR}/usr/include" \ diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile index 0af10f763..568cc1071 100644 --- a/package/tinyxml/Makefile +++ b/package/tinyxml/Makefile @@ -28,6 +28,6 @@ tinyxml-install: $(CP) $(WRKBUILD)/libtinyxml*.so* \ $(IDIR_TINYXML)/usr/lib $(INSTALL_DATA) $(WRKBUILD)/tiny{str,xml}.h \ - $(STAGING_DIR)/usr/include + $(STAGING_TARGET_DIR)/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index b449a985e..e2a04670d 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --disable-use-tty-group \ --enable-libblkid \ --enable-libmount \ --enable-mount \ - --with-ncurses=$(STAGING_DIR)/usr/include \ + --with-ncurses=$(STAGING_TARGET_DIR)/usr/include \ --libdir=/usr/lib FAKE_FLAGS+= INSTALLSUID="install -m 4755" TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index df586c8c0..a4c6d44a5 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc TARGET_LDFLAGS+= -ltirpc watchdog-install: diff --git a/package/wget/Makefile b/package/wget/Makefile index 7abbe7241..9c412c3ea 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-ssl=openssl endif ifeq (${ADK_PACKAGE_WGET_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-ssl=gnutls \ - --with-libgnutls-prefix="$(STAGING_DIR)/usr" + --with-libgnutls-prefix="$(STAGING_TARGET_DIR)/usr" endif AUTOTOOL_STYLE:= autoreconf diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 8f6e0efee..e1545e64c 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -33,7 +33,7 @@ $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RE CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/libnl3 +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libnl3 MAKE_FLAGS+= CPPFLAGS='${TARGET_CPPFLAGS}' \ LDFLAGS='${TARGET_LDFLAGS}' \ diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 282cf88fb..fed181d92 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -43,14 +43,14 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS XAKE_FLAGS+= V=1 TIXML_USE_STL=1 XAKE_FLAGS+= GCC_HONOUR_COPTS=s -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \ +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \ -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/opt/vc/include \ - -I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux -TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/opt/vc/include \ + -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \ + -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux +TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/opt/vc/lib -lkhrn_static endif AUTOTOOL_STYLE:= autoreconf diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index eca8ab4f5..9e5d2b3b1 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -27,16 +27,16 @@ include $(TOPDIR)/mk/python.mk HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) -CONFIGURE_ARGS+= --datadir=${STAGING_DIR}/usr/share +CONFIGURE_ARGS+= --datadir=${STAGING_TARGET_DIR}/usr/share post-build: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb xcb-python-install: - $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + $(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index af603f7bb..42e3f7b83 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -19,7 +19,7 @@ $(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP CONFIGURE_ARGS+= --without-libwrap \ --with-loadavg ALL_TARGET:= build -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc TARGET_LDFLAGS+= -ltirpc xinetd-install: |