[pl] Replace rpath patch with linker option
Petr Pisar
ppisar at fedoraproject.org
Thu Dec 16 15:42:28 UTC 2010
commit d6950c8c36cf024242840ce75ad000071fd54358
Author: Petr Písař <ppisar at redhat.com>
Date: Fri Dec 10 12:57:50 2010 +0100
Replace rpath patch with linker option
The chrpath utility described in README does not work as the configure.in
contains bug. Also chrpath is not called on libraries. The --enable-new-dtags
affects all executables.
pl.spec | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/pl.spec b/pl.spec
index 087d2aa..9422f43 100644
--- a/pl.spec
+++ b/pl.spec
@@ -22,7 +22,6 @@ URL: http://www.swi-prolog.org
Source: http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
Source1: http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-%{version}.pdf
#Source2: http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz
-Patch0: %{name}-5.7.11-rpath.patch
Patch1: %{name}-5.7.11-jpl-configure.patch
Patch2: %{name}-5.7.11-man-files.patch
Patch3: %{name}-5.6.60-jni.patch
@@ -30,7 +29,6 @@ Patch4: %{name}-5.7.11-pc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Base
-BuildRequires: chrpath
BuildRequires: gmp-devel
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
@@ -126,7 +124,6 @@ in Prolog. In both setups it provides a reentrant bidirectional interface.
%prep
%setup -q
-#%patch0 -p1 -b .rpath
#%patch1 -p1 -b .libjvm
#%patch2 -p1 -b .man-files
#%patch3 -p1 -b .jni
@@ -170,10 +167,10 @@ export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
export DISABLE_PKGS="jpl"
%endif
-%configure --enable-shared
+%configure --enable-shared LDFLAGS="-Wl,--enable-new-dtags"
make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
pushd packages
-%configure
+%configure LDFLAGS="-Wl,--enable-new-dtags"
make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" JAVALIBS="-L$JAVA_LIB/server -L$JAVA_LIB -ljava -lverify -ljvm"
popd
@@ -301,6 +298,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Dec 09 2010 Petr Pisar <ppisar at redhat.com> - 5.10.2-1
- 5.10.2 bump
+- Use DT_RUNPATH instead of pl-5.7.11-rpath.patch
* Wed Dec 8 2010 Petr Pisar <ppisar at redhar.com> - 5.7.11-6
- Inhibit XPCE by macro to silent rpmlint
More information about the scm-commits
mailing list