From 538fd6d2805c5b15b7d25a2f92675cdaa19df9f0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Feb 2011 20:42:43 +0100 Subject: squid needs libtool --- package/squid/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squid/Makefile b/package/squid/Makefile index ccf7473cd..f34f4d3ff 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c70ef1198e6a6c1ae80bc57cd3592e36 PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread -PKG_BUILDDEP:= openssl +PKG_BUILDDEP:= openssl libtool PKG_URL:= http://www.squid-cache.org/ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.1/ PKG_MULTI:= 1 -- cgit v1.2.3 From 03a3e89323b25baa92185a5282dfb2d3cb9eab5f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Feb 2011 20:43:07 +0100 Subject: extra call to depend seems not required anymore --- package/openssl/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index b6ba26f02..3853a9de4 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -58,9 +58,6 @@ do-configure: ); do-build: - $(MAKE) -C $(WRKBUILD) \ - OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ - depend $(MAKE) -C $(WRKBUILD) \ CC="$(TARGET_CC)" \ AR="$(TARGET_CROSS)ar r" \ -- cgit v1.2.3 From 57d44e3bc19390598a3a3cd8368d29344975f1f7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Feb 2011 21:30:37 +0100 Subject: allow cross-compile on Darwin, remove broken rpm package (unused). --- package/libstdcxx/Makefile | 1 + package/rpm/Makefile | 39 --------------------------- package/rpm/patches/patch-configure | 11 -------- package/rrs/Makefile | 3 +-- package/squid/Makefile | 5 ++-- package/squid/patches/patch-lib_util_c | 11 ++++++++ package/valgrind/Makefile | 1 - package/valgrind/patches/patch-configure | 11 ++++++++ package/valgrind/patches/patch-configure.orig | 11 ++++++++ package/xfsprogs/Makefile | 2 -- package/xfsprogs/patches/patch-configure | 16 ++++++++++- 11 files changed, 53 insertions(+), 58 deletions(-) delete mode 100644 package/rpm/Makefile delete mode 100644 package/rpm/patches/patch-configure create mode 100644 package/squid/patches/patch-lib_util_c create mode 100644 package/valgrind/patches/patch-configure create mode 100644 package/valgrind/patches/patch-configure.orig diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index efdb3ba72..a16954026 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -32,6 +32,7 @@ ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib + -@rm ${IDIR_LIBSTDCXX}/usr/lib/libstdc++.so.*-gdb.py endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rpm/Makefile b/package/rpm/Makefile deleted file mode 100644 index 566b56251..000000000 --- a/package/rpm/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# 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 - -PKG_NAME:= rpm -PKG_VERSION:= 5.3.5 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 7a5112fd208bfda7a1cab20b9ce17a02 -PKG_DESCR:= Package Manager -PKG_SECTION:= base -PKG_URL:= http://www.rpm.org/ -PKG_SITES:= http://rpm5.org/files/rpm/rpm-5.3/ - -PKG_CFLINE_RPM:= depends on ADK_BROKEN -PKG_HOST_DEPENDS:= !cygwin !darwin -PKG_ARCH_DEPENDS:= !cris - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ENV+= ac_cv_va_copy=no -CONFIGURE_ARGS+= --with-usecrypto=BeeCrypt \ - --with-beecrypt=internal \ - --with-db=external \ - --with-sqlite=none \ - --without-python \ - --without-perl \ - --without-ruby \ - --without-lua - -post-install: - $(INSTALL_DIR) $(IDIR_RPM)/usr/bin $(IDIR_RPM)/usr/lib/rpm - $(INSTALL_BIN) $(WRKINST)/usr/bin/rpm* $(IDIR_RPM)/usr/bin - $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_RPM)/usr/lib - $(CP) $(WRKINST)/usr/lib/rpm/* $(IDIR_RPM)/usr/lib/rpm - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rpm/patches/patch-configure b/package/rpm/patches/patch-configure deleted file mode 100644 index e5e2a854c..000000000 --- a/package/rpm/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-5.3.5.orig/configure 2010-10-25 18:35:18.000000000 +0200 -+++ rpm-5.3.5/configure 2011-01-21 22:37:21.147399617 +0100 -@@ -17673,7 +17673,7 @@ if test "${enable_build_debug+set}" = se - fi - - if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then -- for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions -fnested-functions -+ for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions -fnested-functions - do - my_save_cflags="$CFLAGS" - CFLAGS=$c diff --git a/package/rrs/Makefile b/package/rrs/Makefile index 652cb7993..c69464d32 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -13,10 +13,9 @@ PKG_DEPENDS:= zlib libopenssl PKG_BUILDDEP:= zlib openssl PKG_URL:= http://www.cycom.se/dl/rrs/ PKG_SITES:= http://www.cycom.se/uploads/36/19/ +PKG_NEED_CXX:= 1 PKG_CXX:= RRS -PKG_HOST_DEPENDS:= !darwin - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RRS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/squid/Makefile b/package/squid/Makefile index ccf7473cd..2fce59548 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -10,17 +10,18 @@ PKG_MD5SUM:= c70ef1198e6a6c1ae80bc57cd3592e36 PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread -PKG_BUILDDEP:= openssl +PKG_BUILDDEP:= openssl libtool PKG_URL:= http://www.squid-cache.org/ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.1/ PKG_MULTI:= 1 +PKG_NEED_CXX:= 1 PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKEAUTH -PKG_HOST_DEPENDS:= !netbsd !cygwin !darwin +PKG_HOST_DEPENDS:= !netbsd !cygwin AUTH_MODULES:= basic digest ntlm ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c new file mode 100644 index 000000000..b50c4afb2 --- /dev/null +++ b/package/squid/patches/patch-lib_util_c @@ -0,0 +1,11 @@ +--- squid-3.1.4.orig/lib/util.c 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/lib/util.c 2011-02-14 20:44:04.000000000 +0100 +@@ -56,7 +56,7 @@ + #if HAVE_GNUMALLLOC_H + #include + #elif HAVE_MALLOC_H +-#include ++#include + #endif + #if HAVE_ERRNO_H + #include diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 5940b1afe..d156b0bee 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -13,7 +13,6 @@ PKG_URL:= http://valgrind.org/ PKG_SITES:= http://valgrind.org/downloads/ PKG_ARCH_DEPENDS:= x86 x86_64 native -PKG_HOST_DEPENDS:= !darwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure new file mode 100644 index 000000000..e4d957a21 --- /dev/null +++ b/package/valgrind/patches/patch-configure @@ -0,0 +1,11 @@ +--- valgrind-3.6.0.orig/configure 2010-10-21 03:16:18.000000000 +0200 ++++ valgrind-3.6.0/configure 2011-02-14 17:26:48.000000000 +0100 +@@ -5345,7 +5345,7 @@ $as_echo "ok (${host_os})" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the kernel version" >&5 + $as_echo_n "checking for the kernel version... " >&6; } + +- kernel=`uname -r` ++ kernel=2.6.37 + + case "${kernel}" in + 2.6.*) diff --git a/package/valgrind/patches/patch-configure.orig b/package/valgrind/patches/patch-configure.orig new file mode 100644 index 000000000..adfc3a89c --- /dev/null +++ b/package/valgrind/patches/patch-configure.orig @@ -0,0 +1,11 @@ +--- valgrind-3.6.0.orig/configure 2010-10-21 03:16:18.000000000 +0200 ++++ valgrind-3.6.0/configure 2011-02-14 17:25:41.000000000 +0100 +@@ -5345,7 +5345,7 @@ $as_echo "ok (${host_os})" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the kernel version" >&5 + $as_echo_n "checking for the kernel version... " >&6; } + +- kernel=`uname -r` ++ kernel=2.6 + + case "${kernel}" in + 2.6.*) diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 9f5b2ee38..f22b8aec2 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -15,8 +15,6 @@ PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ -PKG_HOST_DEPENDS:= !darwin - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure index 24d7f645e..ea30c4cdb 100644 --- a/package/xfsprogs/patches/patch-configure +++ b/package/xfsprogs/patches/patch-configure @@ -1,5 +1,19 @@ --- xfsprogs-3.1.4.orig/configure 2010-11-11 18:38:31.000000000 +0100 -+++ xfsprogs-3.1.4/configure 2011-01-22 19:33:52.458658054 +0100 ++++ xfsprogs-3.1.4/configure 2011-02-14 20:26:03.000000000 +0100 +@@ -11214,11 +11214,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP" + + +- pkg_distribution=`uname -s` ++ pkg_distribution=Linux + test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" + + +- pkg_platform=`uname -s | tr 'A-Z' 'a-z' | tr -d / | sed -e 's/irix64/irix/'` ++ pkg_platform=linux + test -z "$PLATFORM" || pkg_platform="$PLATFORM" + + @@ -12604,349 +12604,6 @@ fi -- cgit v1.2.3 From 4401ddc3d2a942a835ae07783a9d2d1470123862 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Feb 2011 21:31:05 +0100 Subject: remove obsolete file --- package/valgrind/patches/patch-configure.orig | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 package/valgrind/patches/patch-configure.orig diff --git a/package/valgrind/patches/patch-configure.orig b/package/valgrind/patches/patch-configure.orig deleted file mode 100644 index adfc3a89c..000000000 --- a/package/valgrind/patches/patch-configure.orig +++ /dev/null @@ -1,11 +0,0 @@ ---- valgrind-3.6.0.orig/configure 2010-10-21 03:16:18.000000000 +0200 -+++ valgrind-3.6.0/configure 2011-02-14 17:25:41.000000000 +0100 -@@ -5345,7 +5345,7 @@ $as_echo "ok (${host_os})" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the kernel version" >&5 - $as_echo_n "checking for the kernel version... " >&6; } - -- kernel=`uname -r` -+ kernel=2.6 - - case "${kernel}" in - 2.6.*) -- cgit v1.2.3 From 9ac3310d527fc15d215d61fa78e886fd0ed8054f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 15 Feb 2011 19:02:07 +0100 Subject: acoid libtool relink, because it fails. --- package/gettext/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/gettext/Makefile b/package/gettext/Makefile index d01eddbc1..e970b6510 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -47,22 +47,28 @@ CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \ ac_cv_gnu_library_2=no \ gt_use_preinstalled_gnugettext=no +INSTALL_STYLE:= manual + libintl-install: ${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libintl.so* \ + ${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \ ${IDIR_LIBINTL}/usr/lib gettext-install: ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/gettext \ + $(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \ $(IDIR_GETTEXT)/usr/bin msgfmt-install: ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgettext*so* \ + ${CP} ${WRKBUILD}/gettext-tools/libgettextpo/.libs/libgettextpo.so* \ + ${IDIR_MSGFMT}/usr/lib + ${CP} ${WRKBUILD}/gettext-tools/gnulib-lib/.libs/libgettextlib*so* \ + ${IDIR_MSGFMT}/usr/lib + ${CP} ${WRKBUILD}/gettext-tools/src/.libs/libgettextsrc*so* \ ${IDIR_MSGFMT}/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/bin/msgfmt \ + $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgfmt \ $(IDIR_MSGFMT)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3