diff options
Diffstat (limited to 'package/cups')
| -rw-r--r-- | package/cups/Makefile | 8 | ||||
| -rw-r--r-- | package/cups/patches/patch-configure | 26 |
2 files changed, 28 insertions, 6 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index d17d58cda..c8cac765f 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -24,9 +24,9 @@ $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_cv_func_sigset=no \ - OPTIM='' -CONFIGURE_ARGS+= --with-cups-user=root \ - --with-cups-group=root \ + OPTIM='-fPIC' +CONFIGURE_ARGS+= --with-cups-user=0 \ + --with-cups-group=0 \ --disable-ldap \ --disable-gssapi \ --disable-pam \ @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --with-cups-user=root \ BUILD_STYLE= auto INSTALL_STYLE= auto FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" -XAKE_FLAGS+= OPTIM='' +XAKE_FLAGS+= OPTIM='-fPIC' post-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 773a2da96..82550e632 100644 --- a/package/cups/patches/patch-configure +++ b/package/cups/patches/patch-configure @@ -1,7 +1,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- cups-1.3.10.orig/configure 2009-04-16 22:02:06.000000000 +0200 -+++ cups-1.3.10/configure 2009-05-09 22:44:29.000000000 +0200 -@@ -9254,7 +9254,7 @@ if test "$libdir" = "\${exec_prefix}/lib ++++ cups-1.3.10/configure 2009-05-31 19:41:18.000000000 +0200 +@@ -7460,9 +7460,6 @@ done + + + case $uname in +- Darwin* | *BSD*) +- ARFLAGS="-rcv" +- ;; + *) + ARFLAGS="crvs" + ;; +@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib ;; Linux*) if test -d /usr/lib64; then @@ -10,3 +20,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi ;; HP-UX*) +@@ -9587,11 +9584,6 @@ _ACEOF + + # Server executables... + case "$uname" in +- *BSD* | Darwin*) +- # *BSD and Darwin (MacOS X) +- INSTALL_SYSV="" +- CUPS_SERVERBIN="$exec_prefix/libexec/cups" +- ;; + *) + # All others + INSTALL_SYSV="install-sysv" |