pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files commit my fix for PR pkg/37128
details: https://anonhg.NetBSD.org/pkgsrc/rev/bdd3904e08ee
branches: trunk
changeset: 543033:bdd3904e08ee
user: tnn <tnn%pkgsrc.org@localhost>
date: Sun Jun 01 14:36:37 2008 +0000
description:
commit my fix for PR pkg/37128
Ensure Linux shared libraries get the correct rpath built in.
ok joerg. Bump rev.
diffstat:
x11/xorg-cf-files/Makefile | 4 ++--
x11/xorg-cf-files/distinfo | 4 ++--
x11/xorg-cf-files/patches/patch-aj | 11 ++++++++++-
3 files changed, 14 insertions(+), 5 deletions(-)
diffs (54 lines):
diff -r 1a4f9de1561e -r bdd3904e08ee x11/xorg-cf-files/Makefile
--- a/x11/xorg-cf-files/Makefile Sun Jun 01 14:29:20 2008 +0000
+++ b/x11/xorg-cf-files/Makefile Sun Jun 01 14:36:37 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/05/24 21:45:18 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/01 14:36:37 tnn Exp $
#
DISTNAME= xorg-cf-files-1.0.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
diff -r 1a4f9de1561e -r bdd3904e08ee x11/xorg-cf-files/distinfo
--- a/x11/xorg-cf-files/distinfo Sun Jun 01 14:29:20 2008 +0000
+++ b/x11/xorg-cf-files/distinfo Sun Jun 01 14:36:37 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/01/25 18:55:02 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/06/01 14:36:37 tnn Exp $
SHA1 (xorg-cf-files-1.0.2.tar.bz2) = a1182e1fd05a648e6282598a355b7c4be9339755
RMD160 (xorg-cf-files-1.0.2.tar.bz2) = dc42aa06d7fb5bc073d51958763bf1bfcfd22926
@@ -12,4 +12,4 @@
SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
-SHA1 (patch-aj) = 5060968a789b0cf2568e4b3eb71d9e988d7f3d9e
+SHA1 (patch-aj) = 6fd05a766895c06b940e28cd5cadde48365790c3
diff -r 1a4f9de1561e -r bdd3904e08ee x11/xorg-cf-files/patches/patch-aj
--- a/x11/xorg-cf-files/patches/patch-aj Sun Jun 01 14:29:20 2008 +0000
+++ b/x11/xorg-cf-files/patches/patch-aj Sun Jun 01 14:36:37 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2008/01/25 18:55:02 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2008/06/01 14:36:37 tnn Exp $
Force Rpath usage on Linux. For reasons analysed in details,
the binutils detection seems to fail.
@@ -14,6 +14,15 @@
#endif
#ifndef SharedOldX
+@@ -78,7 +78,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+ #define LibraryRpathLoadFlags RpathLoadFlags
+ #endif
+ # ifndef SharedLibraryLoadFlags
+-# define SharedLibraryLoadFlags -shared
++# define SharedLibraryLoadFlags -shared RpathLoadFlags
+ # endif
+ # ifndef PositionIndependentCFlags
+ # define PositionIndependentCFlags -fPIC
@@ -87,17 +87,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
# define PositionIndependentCplusplusFlags -fPIC
# endif
Home |
Main Index |
Thread Index |
Old Index