From fd6e91a86e8d3bff49f1e893ad243d8fc0e324a5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Jan 2011 17:28:19 +0100 Subject: allow cross-compile under Darwin, fix ppp install targets --- mk/build.mk | 2 +- mk/package.mk | 3 +++ mk/vars.mk | 2 +- package/gnutls/Makefile | 1 + package/heimdal/Makefile | 10 ++++------ package/libstdcxx/Makefile | 6 +++--- package/net-snmp/Makefile | 10 +++++----- package/ppp/Makefile | 14 +++++++------- package/syslinux/Makefile | 2 ++ package/tcl/Makefile | 8 ++++---- 10 files changed, 31 insertions(+), 27 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index ef551741a..a72cd4f05 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -135,7 +135,7 @@ endif ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include,usr/lib} \ - ${STAGING_HOST_DIR}/{bin,lib} + ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib} ${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) diff --git a/mk/package.mk b/mk/package.mk index e42ced661..cab7b6947 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -75,9 +75,12 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \ ${HOST_CONFIGURE_OPTS} \ CC='${TARGET_CC}' \ CXX='${TARGET_CXX}' \ + LD='${TARGET_LD}' \ AR='${TARGET_CROSS}ar' \ RANLIB='${TARGET_CROSS}ranlib' \ NM='${TARGET_CROSS}nm' \ + OBJCOPY='${TARGET_CROSS}objcopy' \ + RANLIB='${TARGET_CROSS}ranlib' \ STRIP='${TARGET_CROSS}strip' \ CROSS="$(TARGET_CROSS)" endif diff --git a/mk/vars.mk b/mk/vars.mk index 6a0f50a2f..8bbb7765b 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -51,7 +51,7 @@ BIN_DIR_PFX:= $(BASE_DIR)/bin PACKAGE_DIR:= $(BIN_DIR)/packages TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} TARGET_DIR_PFX:= $(BASE_DIR)/root_* -TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} +TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux ifeq ($(ADK_NATIVE),y) diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 7a289205e..e75ae7f9f 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -33,6 +33,7 @@ $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${ CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \ + --disable-rpath \ --without-libz-prefix post-install: diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 4d2a13eb6..4d7ecafa5 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -79,23 +79,21 @@ ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe endif -pre-configure: +post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - env CFLAGS="-static" LDFLAGS="-static" \ ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ --without-openldap \ --disable-sqlite-cache \ --disable-otp \ - --enable-static \ - --disable-shared \ ); ${MAKE} -C ${WRKBUILD}/include ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers ${MAKE} -C ${WRKBUILD}/lib/editline - ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) - ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) ${MAKE} -C ${WRKBUILD}/lib/roken install ${MAKE} -C ${WRKBUILD}/lib/asn1 install ${MAKE} -C ${WRKBUILD}/lib/sl install diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index eb935fbb8..470cc57a7 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -27,11 +27,11 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: - ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib + ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/lib ifeq ($(ADK_NATIVE),y) - $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/usr/lib else - $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) ${STAGING_TARGET_DIR}/usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 38e7941c0..859e8a658 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= net-snmp -PKG_VERSION:= 5.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1 +PKG_VERSION:= 5.6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b4e30ead5783b0bb1d280172c6095ea4 PKG_DESCR:= SNMP Agent PKG_SECTION:= net/misc -PKG_DEPENDS:= libnetsnmp libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= libnetsnmp libelf libnl +PKG_BUILDDEP:= libelf libnl PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} PKG_NOPARALLEL:= 1 diff --git a/package/ppp/Makefile b/package/ppp/Makefile index ec0e5782e..55038a276 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -61,7 +61,7 @@ ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) ${IDIR_PPP}/etc/network/if-pre-up.d/05-ppp endif -mod-radius-install: +ppp-mod-radius-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient ${CP} ${WRKBUILD}/pppd/plugins/radius/etc/* \ ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient @@ -70,7 +70,7 @@ mod-radius-install: ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ ${IDIR_PPP_MOD_RADIUS}/usr/lib/pppd/$(PKG_VERSION) -mod-pppoe-install: +ppp-mod-pppoe-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPOE}/usr/lib/pppd/$(PKG_VERSION) ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ ${IDIR_PPP_MOD_PPPOE}/usr/lib/pppd/$(PKG_VERSION) @@ -78,7 +78,7 @@ mod-pppoe-install: ${INSTALL_DATA} ./files/etc/ppp/templates/pppoe \ ${IDIR_PPP_MOD_PPPOE}/etc/ppp/templates/ -mod-pppoa-install: +ppp-mod-pppoa-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPOA}/usr/lib/pppd/$(PKG_VERSION) ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \ ${IDIR_PPP_MOD_PPPOA}/usr/lib/pppd/$(PKG_VERSION) @@ -86,19 +86,19 @@ mod-pppoa-install: ${INSTALL_DATA} ./files/etc/ppp/templates/pppoa \ ${IDIR_PPP_MOD_PPPOA}/etc/ppp/templates/ -mod-chat-install: +ppp-mod-chat-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_CHAT}/usr/sbin ${CP} ${WRKINST}/usr/sbin/chat ${IDIR_PPP_MOD_CHAT}/usr/sbin/ -mod-pppdump-install: +ppp-mod-pppdump-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPDUMP}/usr/sbin ${CP} ${WRKINST}/usr/sbin/pppdump ${IDIR_PPP_MOD_PPPDUMP}/usr/sbin/ -mod-pppstats-install: +ppp-mod-pppstats-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPSTATS}/usr/sbin ${CP} ${WRKINST}/usr/sbin/pppstats ${IDIR_PPP_MOD_PPPSTATS}/usr/sbin/ -mod-pppumts-install: +ppp-mod-pppumts-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates ${INSTALL_DATA} ./files/etc/ppp/templates/umts \ ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates/ diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile index c5b8de89c..4a877426f 100644 --- a/package/syslinux/Makefile +++ b/package/syslinux/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= nasm PKG_URL:= http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/ +PKG_HOST_DEPENDS:= !darwin !netbsd !openbsd !cygwin !freebsd + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,SYSLINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/tcl/Makefile b/package/tcl/Makefile index d6d257918..7b96c3b45 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -11,8 +11,6 @@ PKG_DESCR:= TCL scripting language PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tcl/} -PKG_HOST_DEPENDS:= !darwin - DISTFILES:= tcl${PKG_VERSION}-src.tar.gz WRKDIST= ${WRKDIR}/tcl${PKG_VERSION} WRKSRC= ${WRKDIST}/unix @@ -25,8 +23,10 @@ TCFLAGS+= -ldl CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \ tcl_cv_strtod_buggy=ok \ tcl_cv_strtod_unbroken=ok \ - tcl_cv_strtoul_unbroken=ok -CONFIGURE_ARGS+= --enable-man-symlinks + tcl_cv_strtoul_unbroken=ok \ + tcl_cv_sys_version="Linux-2.6" +CONFIGURE_ARGS+= --enable-man-symlinks \ + --disable-rpath INSTALL_TARGET= install-binaries install-libraries post-install: -- cgit v1.2.3