diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/cups | |
parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/cups')
-rw-r--r-- | package/cups/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index d57bda49a..762f1832a 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -43,7 +43,11 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --disable-ssl FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +XAKE_FLAGS+= OPTIM='-fPIC -fstack-protector' +else XAKE_FLAGS+= OPTIM='-fPIC' +endif post-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin |