pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/glibmm



Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Dec 29 23:06:14 UTC 2017

Modified Files:
        pkgsrc/devel/glibmm: Makefile buildlink3.mk

Log Message:
glibmm: Add kludge to use gcc 4.9 for depending packages

glibmm seems to need gcc 4.9 to build; therefore set GCC_REQD.

This means that depending packages using other versions (specifically
4.8 on NetBSD 7) will fail to link.  As a kludge to make more things
build for the upcoming branch, force GCC_REQD to 4.9 in glibmm's
buildlink3.mk.  Now, at least some packages that depend on glibmm
build.  While icky, it's my judgement that having more packages
building is better.

This will very likely be reverted either after the branch or as part
of the upcoming compiler selection logic changes.

As proposed on tech-pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/glibmm/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/glibmm/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glibmm/Makefile
diff -u pkgsrc/devel/glibmm/Makefile:1.75 pkgsrc/devel/glibmm/Makefile:1.76
--- pkgsrc/devel/glibmm/Makefile:1.75   Mon Dec 11 13:37:43 2017
+++ pkgsrc/devel/glibmm/Makefile        Fri Dec 29 23:06:14 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2017/12/11 13:37:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2017/12/29 23:06:14 gdt Exp $
 
 DISTNAME=      glibmm-2.54.1
 CATEGORIES=    devel gnome
@@ -10,7 +10,9 @@ HOMEPAGE=     https://www.gtkmm.org/
 COMMENT=       C++ bindings for glib
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1
 
-GCC_REQD+=             4.8
+# With 4.8, one gets the following:
+#   error: no matching function for call to 'regex_replace(const char*&, std::regex, const char [3])'
+GCC_REQD+=             4.9
 USE_LANGUAGES=         c c++11
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/devel/glibmm/buildlink3.mk
diff -u pkgsrc/devel/glibmm/buildlink3.mk:1.15 pkgsrc/devel/glibmm/buildlink3.mk:1.16
--- pkgsrc/devel/glibmm/buildlink3.mk:1.15      Sat Sep 15 10:04:10 2012
+++ pkgsrc/devel/glibmm/buildlink3.mk   Fri Dec 29 23:06:14 2017
@@ -1,10 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/09/15 10:04:10 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2017/12/29 23:06:14 gdt Exp $
 
 BUILDLINK_TREE+=       glibmm
 
 .if !defined(GLIBMM_BUILDLINK3_MK)
 GLIBMM_BUILDLINK3_MK:=
 
+# It is necessary to use the same compiler to link against libmm as it
+# was built with.  This is hacky, but enables at least
+# gnome-system-monitor to build.
+GCC_REQD+=             4.9
+
 BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.24.2
 BUILDLINK_ABI_DEPENDS.glibmm+= glibmm>=2.32.1nb1
 BUILDLINK_PKGSRCDIR.glibmm?=   ../../devel/glibmm



Home | Main Index | Thread Index | Old Index