packages: gcc/gcc.spec, gcc/libffi.pc.in (NEW) - install libffi.pc

[qboosh]

Author: qboosh                       Date: Tue May  3 09:55:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install libffi.pc

---- Files affected:
packages/gcc:
   gcc.spec (1.656 -> 1.657) , libffi.pc.in (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gcc/gcc.spec
diff -u packages/gcc/gcc.spec:1.656 packages/gcc/gcc.spec:1.657
--- packages/gcc/gcc.spec:1.656	Tue May  3 11:37:47 2011
+++ packages/gcc/gcc.spec	Tue May  3 11:55:48 2011
@@ -83,6 +83,7 @@
 Source2:	ftp://sourceware.org/pub/java/ecj-%{major_ecj_ver}.jar
 # Source2-md5:	d7cd6a27c8801e66cbaa964a039ecfdb
 # svn diff -x --ignore-eol-style svn://gcc.gnu.org/svn/gcc/tags/gcc_4_6_0_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch > gcc-branch.diff
+Source3:	libffi.pc.in
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-info.patch
 Patch2:		%{name}-nodebug.patch
@@ -184,8 +185,10 @@
 # 32-bit environment on x86-64,ppc64,s390x,sparc64
 %define		_slibdir32	/lib
 %define		_libdir32	/usr/lib
+%define		_pkgconfigdir32	%{_libdir32}/pkgconfig
 %endif
 %define		gcclibdir	%{_libdir}/gcc/%{_target_platform}/%{version}
+%define		gcjdbexecdir	gcj-%{version}-%{gcj_soname_ver}
 
 %define		filterout	-fwrapv -fno-strict-aliasing -fsigned-char
 %define		filterout_ld	-Wl,--as-needed
@@ -1547,16 +1550,30 @@
 install -d java-doc
 cp -f libjava/READ* java-doc
 ln -sf libgcj-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/libgcj.jar
-rm -f $RPM_BUILD_ROOT%{_libdir}/classpath/libgjs*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/classpath/libgjs*.la
 # tools.zip sources
-rm -rf $RPM_BUILD_ROOT%{_datadir}/classpath/tools/gnu
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/classpath/tools/gnu
+
+# still not installed by gcc?
+[ ! -f $RPM_BUILD_ROOT%{_pkgconfigdir}/libffi.pc ] || exit 1
+sed -e 's, at prefix@,%{_prefix},
+	s, at exec_prefix@,%{_exec_prefix},
+	s, at libdir@,%{_libdir},
+	s, at gcclibdir@,%{gcclibdir},' %{SOURCE3} >$RPM_BUILD_ROOT%{_pkgconfigdir}/libffi.pc
+%if %{with multilib}
+[ ! -f $RPM_BUILD_ROOT%{_pkgconfigdir32}/libffi.pc ] || exit 1
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir32}
+sed -e 's, at prefix@,%{_prefix},
+	s, at exec_prefix@,%{_exec_prefix},
+	s, at libdir@,%{_libdir32},
+	s, at gcclibdir@,%{gcclibdir},' %{SOURCE3} >$RPM_BUILD_ROOT%{_pkgconfigdir32}/libffi.pc
+%endif
 %endif
+
 %if %{with objc}
 cp -f libobjc/README gcc/objc/README.libobjc
 %endif
 
-%define	gcjdbexecdir	gcj-%{version}-%{gcj_soname_ver}
-
 # avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc/%{_target_platform}/%{version}
 # normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
 for f in libssp.la libssp_nonshared.la \
@@ -2308,6 +2325,7 @@
 %{_libdir}/libffi.la
 %{gcclibdir}/include/ffi.h
 %{gcclibdir}/include/ffitarget.h
+%{_pkgconfigdir}/libffi.pc
 %{_mandir}/man3/ffi*.3*
 
 %if %{with multilib}
@@ -2315,6 +2333,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir32}/libffi.so
 %{_libdir32}/libffi.la
+%{_pkgconfigdir32}/libffi.pc
 %endif
 
 %files -n libffi-static
@@ -2381,6 +2400,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.657  2011/05/03 09:55:48  qboosh
+- install libffi.pc
+
 Revision 1.656  2011/05/03 09:37:47  qboosh
 - introduced gcclibdir macro
 

================================================================
Index: packages/gcc/libffi.pc.in
diff -u /dev/null packages/gcc/libffi.pc.in:1.1
--- /dev/null	Tue May  3 11:55:54 2011
+++ packages/gcc/libffi.pc.in	Tue May  3 11:55:49 2011
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@gcclibdir@/include
+
+Name: libffi
+Description: Library supporting Foreign Function Interfaces
+Version: 3.0.9
+Libs: -L${libdir} -lffi
+Cflags: -I${includedir}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gcc/gcc.spec?r1=1.656&r2=1.657&f=u