tizen 2.3.1 release tizen_2.3.1 submit/tizen_2.3.1/20150915.100158 tizen_2.3.1_release
authorjk7744.park <jk7744.park@samsung.com>
Tue, 8 Sep 2015 17:23:02 +0000 (02:23 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Tue, 8 Sep 2015 17:23:02 +0000 (02:23 +0900)
libltdl/m4/libtool.m4
packaging/as-needed.patch [new file with mode: 0644]
packaging/libtool.manifest [deleted file]
packaging/libtool.spec

index 39ba996..191dd57 100644 (file)
@@ -2844,6 +2844,10 @@ if test "$GCC" = yes; then
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
        ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
+      case $ac_prog in
+      *coverity_config*)
+        ac_prog=`$ECHO $ac_prog | cut -d ' ' -f1` ;;
+      esac
       test -z "$LD" && LD="$ac_prog"
       ;;
   "")
diff --git a/packaging/as-needed.patch b/packaging/as-needed.patch
new file mode 100644 (file)
index 0000000..1c4edd4
--- /dev/null
@@ -0,0 +1,32 @@
+diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
+index 814cc93..916d3f6 100644
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -4274,6 +4274,11 @@ func_mode_link ()
+       arg=$func_stripname_result
+       ;;
++      -Wl,--as-needed|-Wl,--no-as-needed)
++        deplibs="$deplibs $arg"
++        continue
++        ;;
++
+       -Wl,*)
+       func_stripname '-Wl,' '' "$arg"
+       args=$func_stripname_result
+@@ -4625,6 +4630,15 @@ func_mode_link ()
+       lib=
+       found=no
+       case $deplib in
++         -Wl,--as-needed|-Wl,--no-as-needed)
++        if test "$linkmode,$pass" = "prog,link"; then
++          compile_deplibs="$deplib $compile_deplibs"
++          finalize_deplibs="$deplib $finalize_deplibs"
++         else
++          deplibs="$deplib $deplibs"
++        fi
++        continue
++        ;;
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
diff --git a/packaging/libtool.manifest b/packaging/libtool.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>
index c854fd8..0faf2a1 100644 (file)
@@ -10,9 +10,9 @@ Summary:        The GNU Portable Library Tool
 Url:            http://www.gnu.org/software/libtool/
 Group:          Development/Tools
 Source:         http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz
-Source1001: packaging/libtool.manifest 
 Patch0:         no-host-name.patch
 Patch1:                fix-AC_LANG_PROGRAM.patch
+Patch2:                as-needed.patch
 
 BuildRequires:  autoconf >= 2.59
 BuildRequires:  automake >= 1.9.2
@@ -66,9 +66,9 @@ Static libraries and header files for development with ltdl.
 %setup -n libtool-%{version} -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-cp %{SOURCE1001} .
 
 ./bootstrap
 
@@ -87,6 +87,10 @@ make
 %make_install
 rm -rf %{buildroot}%{_infodir}
 
+mkdir -p %{buildroot}/usr/share/license
+cp COPYING %{buildroot}/usr/share/license/%{name}
+cp COPYING %{buildroot}/usr/share/license/%{name}-ltdl
+
 %check
 #make check VERBOSE=yes > make_check.log 2>&1 || (cat make_check.log && false)
 
@@ -99,7 +103,6 @@ rm -rf %{buildroot}
 %postun ltdl -p /sbin/ldconfig
 
 %files
-%manifest libtool.manifest
 %defattr(-,root,root)
 %doc AUTHORS COPYING  THANKS 
 %{_bindir}/libtool
@@ -107,20 +110,17 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4
 %exclude %{_datadir}/libtool/libltdl
 %{_datadir}/libtool
+/usr/share/license/%{name}
 
 %files ltdl
-%manifest libtool.manifest
 %defattr(-,root,root)
 %doc libltdl/COPYING.LIB libltdl/README
 %{_libdir}/libltdl.so.*
+/usr/share/license/%{name}-ltdl
 
 %files ltdl-devel
-%manifest libtool.manifest
 %defattr(-,root,root)
 %{_datadir}/libtool/libltdl
 %{_libdir}/libltdl.so
 %{_includedir}/ltdl.h
 %{_includedir}/libltdl
-
-
-