cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better fix, instead of using ONLY_FOR_ARCHS-cups, let's make the

Browse Source 
graphics/colord dependency arch-dependent, ie only enabled on archs
where devel/spidermonkey is available. Disable colord support on other
archs. gtk+3-cups will now build on all archs where gtk+3 builds.
ok ajacoutot@ (MAINTAINER) jasper@
This commit is contained in:
landry 2012-12-12 18:53:08 +00:00
parent 73ce713d49
commit 82cf911e49
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/gtk+3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2012/12/06 15:43:21 jasper Exp $ # $OpenBSD: Makefile,v 1.55 2012/12/12 18:53:08 landry Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -11,6 +11,7 @@ EXTRACT_SUFX= .tar.xz
PKGNAME-main= gtk+3-${V} PKGNAME-main= gtk+3-${V}
PKGNAME-cups= gtk+3-cups-${V} PKGNAME-cups= gtk+3-cups-${V}
REVISION-cups = 0
# grep ^GTK_BINARY_VERSION ${WRKSRC}/Makefile (after do-configure) # grep ^GTK_BINARY_VERSION ${WRKSRC}/Makefile (after do-configure)
GTK_BINARY_VERSION=3.0.0 GTK_BINARY_VERSION=3.0.0
@ -46,8 +47,6 @@ WANTLIB += xcb xcb-render xcb-shm z stdc++ atk-bridge-2.0 atspi
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
MULTI_PACKAGES= -main -cups MULTI_PACKAGES= -main -cups
# sync with devel/spidermonkey
ONLY_FOR_ARCHS-cups= i386 amd64 powerpc sparc64
MODULES= devel/gettext \ MODULES= devel/gettext \
devel/dconf devel/dconf
@ -73,11 +72,10 @@ WANTLIB-main += c
RUN_DEPENDS-cups= # empty RUN_DEPENDS-cups= # empty
LIB_DEPENDS-cups= ${LIB_DEPENDS} \ LIB_DEPENDS-cups= ${LIB_DEPENDS} \
print/cups,-libs \ print/cups,-libs \
graphics/colord \
STEM->=${V}:${BASE_PKGPATH},-main STEM->=${V}:${BASE_PKGPATH},-main
WANTLIB-cups += ${WANTLIB} WANTLIB-cups += ${WANTLIB}
WANTLIB-cups += asn1 crypto cups gdk-3 gssapi gtk-3 krb5 ssl colord lcms2 WANTLIB-cups += asn1 crypto cups gdk-3 gssapi gtk-3 krb5 ssl
USE_GMAKE= Yes USE_GMAKE= Yes
USE_LIBTOOL= Yes USE_LIBTOOL= Yes
@ -94,6 +92,16 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-packagekit \ --disable-packagekit \
--enable-introspection --enable-introspection
# sync archs list with devel/spidermonkey
# colord depends on polkit which depends on spidermonkey
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
LIB_DEPENDS-cups += graphics/colord
WANTLIB-cups += colord lcms2
.else
CONFIGURE_ARGS += --disable-colord
.endif
# If one of these tools is found at configure stage, it might be used, # If one of these tools is found at configure stage, it might be used,
# no matter whether we use --disable-gtk-doc or not. # no matter whether we use --disable-gtk-doc or not.
CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \ CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \