avoid linking all guile-devel consumers to libgc
BR: gcc use %{make_build},%{make_install}
This commit is contained in:
parent
0261b53c8c
commit
87087b6a89
|
@ -0,0 +1,15 @@
|
||||||
|
diff -up guile-2.0.14/meta/guile-2.0.pc.in.pkgconfig_private guile-2.0.14/meta/guile-2.0.pc.in
|
||||||
|
--- guile-2.0.14/meta/guile-2.0.pc.in.pkgconfig_private 2016-12-14 18:03:33.000000000 -0600
|
||||||
|
+++ guile-2.0.14/meta/guile-2.0.pc.in 2018-02-20 11:53:56.344379283 -0600
|
||||||
|
@@ -21,9 +21,9 @@ guile=${bindir}/@guile@
|
||||||
|
Name: GNU Guile
|
||||||
|
Description: GNU's Ubiquitous Intelligent Language for Extension
|
||||||
|
Version: @GUILE_VERSION@
|
||||||
|
-Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@
|
||||||
|
+Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@
|
||||||
|
Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \
|
||||||
|
@LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \
|
||||||
|
@SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \
|
||||||
|
- @INET_PTON_LIB@
|
||||||
|
+ @INET_PTON_LIB@ @BDW_GC_LIBS@
|
||||||
|
Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@
|
15
guile.spec
15
guile.spec
|
@ -2,7 +2,7 @@ Summary: A GNU implementation of Scheme for application extensibility
|
||||||
Name: guile
|
Name: guile
|
||||||
%define mver 2.0
|
%define mver 2.0
|
||||||
Version: 2.0.14
|
Version: 2.0.14
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Epoch: 5
|
Epoch: 5
|
||||||
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
|
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
|
||||||
URL: http://www.gnu.org/software/guile/
|
URL: http://www.gnu.org/software/guile/
|
||||||
|
@ -17,6 +17,9 @@ Requires: coreutils
|
||||||
Patch1: guile-multilib.patch
|
Patch1: guile-multilib.patch
|
||||||
Patch2: guile-i18ntest.patch
|
Patch2: guile-i18ntest.patch
|
||||||
Patch3: guile-threadstest.patch
|
Patch3: guile-threadstest.patch
|
||||||
|
# Avoid linking all guile consumers to libgc
|
||||||
|
# TODO: consider using: Requires.private: bdw-gc
|
||||||
|
Patch4: guile-2.0.14-gc_pkgconfig_private.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
|
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
|
||||||
|
@ -47,6 +50,7 @@ install the guile package.
|
||||||
%patch1 -p1 -b .multilib
|
%patch1 -p1 -b .multilib
|
||||||
%patch2 -p1 -b .i18ntest
|
%patch2 -p1 -b .i18ntest
|
||||||
%patch3 -p1 -b .threadstest
|
%patch3 -p1 -b .threadstest
|
||||||
|
%patch4 -p1 -b .gc_pkgconfig_private
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -56,10 +60,10 @@ install the guile package.
|
||||||
sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
|
sed -i 's|" $sys_lib_dlsearch_path "|" $sys_lib_dlsearch_path %{_libdir} "|' \
|
||||||
libtool
|
libtool
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%{make_build}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
%{make_install}
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site/%{mver}
|
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site/%{mver}
|
||||||
|
|
||||||
|
@ -184,6 +188,11 @@ fi
|
||||||
%{_includedir}/guile
|
%{_includedir}/guile
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5:2.0.14-7
|
||||||
|
- avoid linking all guile-devel consumers to libgc
|
||||||
|
- BR: gcc
|
||||||
|
- use %%{make_build},%%{make_install}
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-6
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:2.0.14-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue