From 807e6d2657a30466ce114782e5fc0a538fe716c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 11 Feb 2011 07:59:36 +0000 Subject: [PATCH] - rel 4; fix static linking with glib2 Changed files: rc-scripts.spec -> 1.345 --- rc-scripts.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rc-scripts.spec b/rc-scripts.spec index 2c1c34d..be70783 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -9,7 +9,7 @@ Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.3.8 -Release: 3 +Release: 4 License: GPL v2 Group: Base Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz @@ -119,7 +119,8 @@ programcıklar içerir. %configure \ --with-localedir=%{localedir} %{__make} \ - %{!?with_static:ppp_watch_LDADD="-lglib-2.0" ppp_watch_DEPENDENCIES=} + %{?with_static:ppp_watch_LDADD="-Wl,-static $(pkg-config --libs --static glib-2.0) -Wl,-Bdynamic" ppp_watch_DEPENDENCIES=} \ + %{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=} %install rm -rf $RPM_BUILD_ROOT @@ -128,7 +129,8 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - %{!?with_static:ppp_watch_LDADD="-lglib-2.0" ppp_watch_DEPENDENCIES=} + %{?with_static:ppp_watch_LDADD="-Wl,-static $(pkg-config --libs --static glib-2.0) -Wl,-Bdynamic" ppp_watch_DEPENDENCIES=} \ + %{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=} for i in 0 1 2 3 4 5 6; do install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d -- 2.44.0