Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22100340 pkgconfig dependency on gettext needs to be variable
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 28 Oct 2015 12:16:02 -0700
changeset 5046 d511b9037189
parent 5045 906daaa0ae92
child 5047 62bb5e41619e
22100340 pkgconfig dependency on gettext needs to be variable
components/pkg-config/Makefile file | annotate | diff | comparison | revisions
components/pkg-config/pkg-config.p5m file | annotate | diff | comparison | revisions 
--- a/components/pkg-config/Makefile	Wed Oct 28 08:34:09 2015 -0700
+++ b/components/pkg-config/Makefile	Wed Oct 28 12:16:02 2015 -0700
@@ -53,6 +53,14 @@
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "/^+ sed -e /d" '
 
+ifeq ($(OS_VERSION),5.11)
+OLD_DESKTOP_BUILD=	0.175.2.0.0.21.0
+else
+OLD_DESKTOP_BUILD=	5.12.0.0.0.25.0
+endif
+
+PKG_MACROS +=		OLD_DESKTOP_BUILD=$(OLD_DESKTOP_BUILD)
+
 # common targets
 configure:	$(CONFIGURE_64)
 
--- a/components/pkg-config/pkg-config.p5m	Wed Oct 28 08:34:09 2015 -0700
+++ b/components/pkg-config/pkg-config.p5m	Wed Oct 28 12:16:02 2015 -0700
@@ -47,4 +47,5 @@
 # pkg-config was previously in the gettext package of the 'desktop'
 # consolidation. This optional dependency is here to facilitate the safe
 # transfer of the package to the 'userland' consolidation.
-depend type=optional fmri=pkg:/developer/gnome/[email protected]
+depend type=optional \
+    fmri=pkg:/developer/gnome/[email protected]$(OLD_DESKTOP_BUILD)
upstream/oracle/userland-gate