diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-09 11:53:06 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-09 11:53:06 +0100 |
| commit | ecf3290a88183d946e731b2fb3992dc5c3222a0f (patch) | |
| tree | f41a6b067eacec9f941345cc5764c97ce140f35b /package/cups | |
| parent | 4e93572589af66eee723efafa3939f6c5e0dd7cc (diff) | |
| parent | 108dbac584a1ffc505dc2d02d95ebb2c5e3ddaf7 (diff) | |
merge
Diffstat (limited to 'package/cups')
| -rw-r--r-- | package/cups/Makefile | 11 | ||||
| -rw-r--r-- | package/cups/patches/patch-Makedefs_in | 10 | ||||
| -rw-r--r-- | package/cups/patches/patch-configure | 19 |
3 files changed, 26 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-Makedefs_in b/package/cups/patches/patch-Makedefs_in new file mode 100644 index 000000000..1a8f91894 --- /dev/null +++ b/package/cups/patches/patch-Makedefs_in @@ -0,0 +1,10 @@ +--- cups-1.7.1.orig/Makedefs.in 2013-07-17 17:21:18.000000000 +0200 ++++ cups-1.7.1/Makedefs.in 2014-01-31 08:40:55.000000000 +0100 +@@ -238,7 +238,6 @@ DBUSDIR = @DBUSDIR@ + # Rules... + # + +-.SILENT: + .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz + + .c.o: 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*) |