Date: Tue, 1 May 2018 16:24:38 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468766 - in head/print/cups: . files Message-ID: <201805011624.w41GOcsq010730@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue May 1 16:24:38 2018 New Revision: 468766 URL: https://svnweb.freebsd.org/changeset/ports/468766 Log: - Update to 2.2.7. - Remove -Wl,-R flag from cups-config output to fix out of tree builds of Gnome. The -R flag takes precedence over -L flags when the linker searches for dependencies of libraries listed on the command line which can be unexpected. Therefore, config scripts like this should only provide -L flags. An rpath is then typically generated automatically by the build system (cmake, libtool,...). [1] PR: 227891 [1] Reported by: Ting-Wei Lan <lantw44@gmail.com> Modified: head/print/cups/Makefile head/print/cups/distinfo head/print/cups/files/patch-configure Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups/Makefile Tue May 1 16:00:12 2018 (r468765) +++ head/print/cups/Makefile Tue May 1 16:24:38 2018 (r468766) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.7 DISTVERSIONPREFIX=v CATEGORIES= print Modified: head/print/cups/distinfo ============================================================================== --- head/print/cups/distinfo Tue May 1 16:00:12 2018 (r468765) +++ head/print/cups/distinfo Tue May 1 16:24:38 2018 (r468766) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509625871 -SHA256 (apple-cups-v2.2.6_GH0.tar.gz) = bf75b33755be92ffe11642dc54365d876c57cee13d6e12507645a8c2d570033a -SIZE (apple-cups-v2.2.6_GH0.tar.gz) = 10317889 +TIMESTAMP = 1525186763 +SHA256 (apple-cups-v2.2.7_GH0.tar.gz) = 863e9179fc232bb8336055730acb77e5be3253acde3d9e2e379beeb7b2b16d19 +SIZE (apple-cups-v2.2.7_GH0.tar.gz) = 10329777 Modified: head/print/cups/files/patch-configure ============================================================================== --- head/print/cups/files/patch-configure Tue May 1 16:00:12 2018 (r468765) +++ head/print/cups/files/patch-configure Tue May 1 16:24:38 2018 (r468766) @@ -1,6 +1,6 @@ ---- configure.orig 2016-02-05 17:22:09 UTC +--- configure.orig 2018-03-23 03:48:36 UTC +++ configure -@@ -5656,7 +5663,6 @@ if test "${with_dbusdir+set}" = set; the +@@ -5827,7 +5827,6 @@ if test "${with_dbusdir+set}" = set; then : fi @@ -8,7 +8,15 @@ DBUS_NOTIFIER="" DBUS_NOTIFIERLIBS="" -@@ -8684,13 +8690,7 @@ fi +@@ -6688,7 +6687,6 @@ if test "$DSO" != ":"; then + if test $exec_prefix != /usr; then + DSOFLAGS="-Wl,-R$libdir $DSOFLAGS" + LDFLAGS="$LDFLAGS -Wl,-R$libdir" +- EXPORT_LDFLAGS="-Wl,-R$libdir" + fi + ;; + linux* | gnu*) +@@ -8802,13 +8800,7 @@ fi PAMLIBS="-lpam" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805011624.w41GOcsq010730>