summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-05 14:33:33 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-05 14:33:33 +0100
commit7e8cdcf2032ee3ff5ed90a15dbe0c4baefe96edb (patch)
treec590cf76c8224c3312bc6274e3cd15d57b6f33b9
parentd96d9c10cfa4b990cc70c7660cdc13c7c6bafa86 (diff)
fix cups build on darwin
-rw-r--r--package/cups/Makefile11
-rw-r--r--package/cups/patches/patch-configure19
2 files changed, 16 insertions, 14 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 4d83cf472..f67813494 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -15,6 +15,7 @@ PKG_URL:= http://www.cups.org/
PKG_SITES:= http://www.cups.org/software/${PKG_VERSION}/
PKG_NEED_CXX:= 1
PKG_OPTS:= dev
+PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
@@ -32,6 +33,7 @@ HOST_STYLE:= auto
HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \
--disable-webif \
--disable-gssapi \
+ --disable-avahi \
--disable-pam \
--disable-dbus \
--without-java \
@@ -46,10 +48,12 @@ HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \
--with-components=core \
--with-rcdir=$(STAGING_HOST_DIR)/etc
CONFIGURE_ENV+= ac_cv_func_sigset=no \
- OPTIM='-fPIC'
+ OPTIM='-fPIC -std=c89'
CONFIGURE_ARGS+= --with-cups-user=cups \
--with-cups-group=cups \
+ --disable-static \
+ --disable-avahi \
--disable-webif \
--disable-tcp-wrappers \
--disable-gssapi \
@@ -68,11 +72,6 @@ CONFIGURE_ARGS+= --with-cups-user=cups \
--with-rcdir=$(STAGING_TARGET_DIR)/etc
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
cups-install:
${INSTALL_DIR} ${IDIR_CUPS}/usr/lib
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
index 19c9f6092..3a4974140 100644
--- a/package/cups/patches/patch-configure
+++ b/package/cups/patches/patch-configure
@@ -1,11 +1,14 @@
--- cups-1.7.1.orig/configure 2014-01-08 17:26:27.000000000 +0100
-+++ cups-1.7.1/configure 2014-01-24 18:05:03.000000000 +0100
-@@ -5792,7 +5792,7 @@ fi
++++ cups-1.7.1/configure 2014-01-31 16:48:50.000000000 +0100
+@@ -2490,9 +2490,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- case "$COMPONENTS" in
- all)
-- BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
-+ BUILDDIRS="filter backend berkeley monitor notifier ppdc conf data"
- ;;
- core)
+
+-uname=`uname`
+-uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'`
+-uarch=`uname -m`
++uname=Linux
++uversion=3.0
+
+ case "$uname" in
+ Darwin*)