diff options
| author | joerg <joerg@pkgsrc.org> | 2012-05-29 20:23:12 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-05-29 20:23:12 +0000 |
| commit | b70ec208283693b9bd000bfbdc4280c637554d69 (patch) | |
| tree | adb368fbcc64ed2b03e586a159496f5ee0885327 /www | |
| parent | 0dd0a601043c24d2ca482745677bf34ea8b40ae1 (diff) | |
| download | pkgsrc-b70ec208283693b9bd000bfbdc4280c637554d69.tar.gz | |
Link with CC like other platforms. Fixes module build with Clang.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 4 | ||||
| -rw-r--r-- | www/apache/distinfo | 4 | ||||
| -rw-r--r-- | www/apache/patches/patch-al | 18 |
3 files changed, 19 insertions, 7 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 2265a672800..abcb0b5c45c 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.200 2012/01/18 14:48:32 adam Exp $ +# $NetBSD: Makefile,v 1.201 2012/05/29 20:23:12 joerg Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). DISTNAME= apache_1.3.42 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} diff --git a/www/apache/distinfo b/www/apache/distinfo index 45dfc128637..804be3ee6c1 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.61 2011/08/04 11:45:20 joerg Exp $ +$NetBSD: distinfo,v 1.62 2012/05/29 20:23:12 joerg Exp $ SHA1 (apache_1.3.42.tar.gz) = b3f8575d855132bc243d79af59ae2a318e7e2c53 RMD160 (apache_1.3.42.tar.gz) = a1573bd04e17cad5d67388cfe08b7f26e06a9ee1 @@ -20,7 +20,7 @@ SHA1 (patch-ah) = 7c7ad1c09a1c849129313bb272106a1dcd2abf7b SHA1 (patch-ai) = 80e35b111e3cbdebf5dc7a8265f454caab791f50 SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01 SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a -SHA1 (patch-al) = aa6add3b91ee87846dd9cbbe5fd563b606fdcfb8 +SHA1 (patch-al) = 07eb4aab03e646184379d13cdf7176e95f1c1ac8 SHA1 (patch-am) = 76bbb4ae3a8cce666bf91fb605f72572350f23a1 SHA1 (patch-an) = 45a5bf946628b1e1b2e60c217214965390f7b3d7 SHA1 (patch-ao) = 96b97e1faf6828a6880c39eb246d07c4a56bfe12 diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al index 0fc8643ec82..5871e8005fc 100644 --- a/www/apache/patches/patch-al +++ b/www/apache/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.9 2008/02/23 05:16:34 obache Exp $ +$NetBSD: patch-al,v 1.10 2012/05/29 20:23:12 joerg Exp $ --- src/Configure.orig 2008-02-23 04:22:55.000000000 +0000 +++ src/Configure @@ -17,7 +17,7 @@ $NetBSD: patch-al,v 1.9 2008/02/23 05:16:34 obache Exp $ *-openbsd*) OS='OpenBSD' DBM_LIB="" -@@ -1111,6 +1119,14 @@ if [ "x$using_shlib" = "x1" ] ; then +@@ -1111,15 +1119,19 @@ if [ "x$using_shlib" = "x1" ] ; then esac LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB ;; @@ -30,5 +30,17 @@ $NetBSD: patch-al,v 1.9 2008/02/23 05:16:34 obache Exp $ + SHLIB_SUFFIX_DEPTH=2 + ;; *-netbsd*) ++ LD_SHLIB="cc" CFLAGS_SHLIB="-fPIC -DPIC" - if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then +- if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then +- LDFLAGS_SHLIB="-Bshareable" +- LDFLAGS_SHLIB_EXPORT="" +- else +- LDFLAGS_SHLIB="-shared" +- LDFLAGS_SHLIB_EXPORT="-Wl,-E" +- fi ++ LDFLAGS_SHLIB="-shared" ++ LDFLAGS_SHLIB_EXPORT="-Wl,-E" + LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB + SHLIB_SUFFIX_DEPTH=2 + ;; |