diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/openldap | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openldap')
| -rw-r--r-- | package/openldap/Makefile | 6 | ||||
| -rw-r--r-- | package/openldap/patches/patch-build_ltmain_sh | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 8b53713cb..937c32bc7 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -24,8 +24,8 @@ PKGSC_OPENLDAP_SLAPD:= net/misc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz -PKG_FLAVOURS:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support +PKG_FLAVOURS_OPENLDAP_SLAPD:= WITH_IPV6 +PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -50,7 +50,7 @@ PKG_CONFIGURE_OPTIONS+= --enable-slapd \ --with-tls \ --with-yielding_select="yes" \ -ifneq (${ADK_PACKAGE_OPENLDAP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_OPENLDAP_SLAPD_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..5876849e1 --- /dev/null +++ b/package/openldap/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- openldap-2.4.23.orig/build/ltmain.sh 2010-04-13 22:22:21.000000000 +0200 ++++ openldap-2.4.23/build/ltmain.sh 2011-01-15 12:35:41.000000000 +0100 +@@ -1668,7 +1668,7 @@ EOF + # -pg 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*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. |