From 5a65c76bc3d72ea9f275a3c474d5e308cf367a82 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Jan 2011 23:18:06 +0100
Subject: remove obsolete SUB_INSTALL stuff.

---
 package/curl/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'package/curl')

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/
 
-- 
cgit v1.2.3


From 15c84adca94bfe4a89ece5c04f06a884cf508ebb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 17 Jan 2011 21:55:49 +0100
Subject: fix packages to be compile with stack protector

- libtool do not pass -fstack-protector while linking,
  but this is required to successfully link libraries or
  executables with SSP
- pass LDFLAGS for non-libtool packages
---
 package/curl/patches/patch-configure |  6 +++---
 package/curl/patches/patch-ltmain_sh | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 package/curl/patches/patch-ltmain_sh

(limited to 'package/curl')

diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure
index 21c0b095d..27e43ebf0 100644
--- a/package/curl/patches/patch-configure
+++ b/package/curl/patches/patch-configure
@@ -1,6 +1,6 @@
---- curl-7.19.7.orig/configure	2009-11-04 13:26:02.000000000 +0100
-+++ curl-7.19.7/configure	2009-12-03 21:07:01.000000000 +0100
-@@ -19233,15 +19233,6 @@ fi
+--- curl-7.21.0.orig/configure	2010-06-05 00:32:04.000000000 +0200
++++ curl-7.21.0/configure	2011-01-14 12:05:38.000000000 +0100
+@@ -19714,15 +19714,6 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
  
diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh
new file mode 100644
index 000000000..b1eef4628
--- /dev/null
+++ b/package/curl/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- curl-7.21.0.orig/ltmain.sh	2010-05-27 21:20:16.000000000 +0200
++++ curl-7.21.0/ltmain.sh	2011-01-14 12:07:25.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
-- 
cgit v1.2.3


From 3d45df344602687c8983f5fb609721aa8ca2469f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 18 Jan 2011 15:32:55 +0100
Subject: rework PKG_FLAVOURS. Subpackages can have flavours, so always add
 PKG_NAME to PKG_FLAVOURS variable. ala PKG_FLAVOURS_LIBNCURSES.

Bug reported by Phil Sutter.
---
 package/curl/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'package/curl')

diff --git a/package/curl/Makefile b/package/curl/Makefile
index c9992052a..4e1dd6bf5 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -21,7 +21,7 @@ PKGSS_LIBCURL:=		libopenssl zlib
 PKGSD_LIBCURL_DEV:=	development files for libcurl
 PKGSC_LIBCURL_DEV:=	devel
 
-PKG_FLAVOURS:=		WITH_IPV6
+PKG_FLAVOURS_CURL:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable IPv6 support
 
 include ${TOPDIR}/mk/package.mk
@@ -58,14 +58,14 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-post-install:
-	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
-
 curl-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
 
+libcurl-install:
+	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
+
 libcurl-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/include/curl/*.h \
-- 
cgit v1.2.3