summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-08-25 15:03:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-25 15:03:23 +0000
commit39e7f49d9c884b6c054d9ba793da52dd3a0876cf (patch)
treead727a2f5784dccd2828fdd48302875e31261d31 /main
parentad70614b79945bf2bed296b6ad737bc871609a1c (diff)
downloadaports-39e7f49d9c884b6c054d9ba793da52dd3a0876cf.tar.bz2
aports-39e7f49d9c884b6c054d9ba793da52dd3a0876cf.tar.xz
main/imap: added fix for ldflags from gentoo
Diffstat (limited to 'main')
-rw-r--r--main/imap/APKBUILD7
-rw-r--r--main/imap/c-client-2007e-ldflags.patch35
2 files changed, 40 insertions, 2 deletions
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index be9cd30ea..f16b2dc14 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -5,7 +5,7 @@
# build it shared
pkgname=imap
pkgver=2007e
-pkgrel=6
+pkgrel=7
pkgdesc="An IMAP/POP server"
url="http://www.washington.edu/imap"
license="APACHE"
@@ -15,6 +15,7 @@ makedepends="openssl-dev"
source="ftp://ftp.cac.washington.edu/$pkgname/$pkgname-$pkgver.tar.gz
c-client-2006k_GENTOO_amd64-so-fix.patch
c-client-2006k_KOLAB_Annotations.patch
+ c-client-2007e-ldflags.patch
"
prepare() {
@@ -35,6 +36,7 @@ build() {
export GCCCFLAGS="$CFLAGS"
make slx SPECIALAUTHENTICATORS=ssl EXTRACFLAGS="$CFLAGS -fPIC" \
+ EXTRALDFLAGS="$LDFLAGS" \
|| return 1
}
@@ -62,4 +64,5 @@ cclient() {
}
md5sums="7903800dc2604000016de070e0c55840 imap-2007e.tar.gz
7f3937a871edd54203fe51f91423e204 c-client-2006k_GENTOO_amd64-so-fix.patch
-c50f734aa18019ecebfc8737ca27cc22 c-client-2006k_KOLAB_Annotations.patch"
+c50f734aa18019ecebfc8737ca27cc22 c-client-2006k_KOLAB_Annotations.patch
+d28962ed76df636ff666c09d420e1451 c-client-2007e-ldflags.patch"
diff --git a/main/imap/c-client-2007e-ldflags.patch b/main/imap/c-client-2007e-ldflags.patch
new file mode 100644
index 000000000..f341cea39
--- /dev/null
+++ b/main/imap/c-client-2007e-ldflags.patch
@@ -0,0 +1,35 @@
+--- a/src/osdep/unix/Makefile~ 2010-08-08 02:30:48.000000000 -0400
++++ b/src/osdep/unix/Makefile 2010-08-08 02:31:08.758000018 -0400
+@@ -959,17 +959,17 @@
+ onceenv:
+ @echo Once-only environment setup...
+ echo $(CC) > CCTYPE
+- echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
++ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
+- echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++ echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
+ -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
+ -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+ -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+- echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++ echo `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+- echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++ echo "`$(CAT) CCTYPE` `$(CAT) LDFLAGS` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
+ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
+ >> ARCHIVE
+ echo $(OS) > OSTYPE
+--- a/src/osdep/unix/Makefile~ 2010-08-08 04:25:00.000000000 -0400
++++ b/src/osdep/unix/Makefile 2010-08-08 04:36:49.720000021 -0400
+@@ -954,7 +954,7 @@
+
+ # Once-only environment setup
+
+-once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+
+ onceenv:
+ @echo Once-only environment setup...