Attachment 235541 Details for Bug 225863 – patch spec and .nousr patch to simplify multiarch changes

[patch] patch spec and .nousr patch to simplify multiarch changes

gsl-simple-multilib-patch.diff (text/plain), 2.71 KB, created by Patrice Dumas on 2007-10-23 21:06:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-10-23 21:06:25 UTC

Size: 2.71 KB

patch

obsolete

>? .build-1.10-3.fc9.log
>? gsl-1.10
>? gsl-1.10-3.fc9.src.rpm
>? gsl-simple-multilib-patch.diff
>? i386
>Index: gsl-1.1-nousr.patch
>===================================================================
>RCS file: /cvs/pkgs/rpms/gsl/devel/gsl-1.1-nousr.patch,v
>retrieving revision 1.1
>diff -u -3 -p -r1.1 gsl-1.1-nousr.patch
>--- gsl-1.1-nousr.patch	9 Sep 2004 05:54:00 -0000	1.1
>+++ gsl-1.1-nousr.patch	23 Oct 2007 21:03:22 -0000
>@@ -1,17 +1,23 @@
>---- gsl-1.1/gsl-config.in.nousr	Thu Mar 21 18:47:56 2002
>-+++ gsl-1.1/gsl-config.in	Thu Mar 21 18:48:36 2002
>-@@ -58,12 +58,12 @@
>+diff -up gsl-1.10/gsl-config.in.nousr gsl-1.10/gsl-config.in
>+--- gsl-1.10/gsl-config.in.nousr	2001-03-21 15:22:44.000000000 +0100
>++++ gsl-1.10/gsl-config.in	2007-10-23 22:48:55.000000000 +0200
>+@@ -58,16 +58,16 @@ while test $# -gt 0; do
>  	;;
>  
>      --cflags)
> -       	echo @GSL_CFLAGS@ 
>-+       	echo @GSL_CFLAGS@ | sed "s|-I/usr/include||g"
>++       	echo -I$includedir
>         	;;
>  
>      --libs)
>          : ${GSL_CBLAS_LIB=-lgslcblas}
> -       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
>-+       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|-L/usr/lib||g"
>++       	echo -lgsl $GSL_CBLAS_LIB -lm
>         	;;
>  
>      --libs-without-cblas)
>+-       	echo @GSL_LIBS@ -lm
>++       	echo -lgsl -lm
>+        	;;
>+     *)
>+ 	usage
>Index: gsl.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
>retrieving revision 1.31
>diff -u -3 -p -r1.31 gsl.spec
>--- gsl.spec	23 Oct 2007 11:09:30 -0000	1.31
>+++ gsl.spec	23 Oct 2007 21:03:22 -0000
>@@ -33,7 +33,7 @@ Library).
> %prep
> %setup -q
> %patch0 -p1 -b .nousr
>-%patch1 -p1 -b .lib64
>+#%patch1 -p1 -b .lib64
> 
> %build
> %configure
>@@ -42,7 +42,7 @@ make %{?_smp_mflags}
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-make install DESTDIR=$RPM_BUILD_ROOT
>+make install DESTDIR=$RPM_BUILD_ROOT install='install -p'
> 
> # remove unpackaged files from the buildroot
> rm -f $RPM_BUILD_ROOT%{_infodir}/dir
>@@ -50,23 +50,6 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}
> rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
> rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
> 
>-gslcsuffix=`echo "%{_lib}" `
>-mv $RPM_BUILD_ROOT%{_bindir}/gsl-config $RPM_BUILD_ROOT%{_bindir}/gsl-config-$gslcsuffix
>-cat > $RPM_BUILD_ROOT%{_bindir}/gsl-config << EOF
>-#!/bin/sh
>-# this construction is necessary to avoid a multilib problem
>-# if a 64 bit version of gsl is installed, it will be used,
>-# otherwise a 32 bit version will be linked
>-if [ -e %{_bindir}/gsl-config-lib64 ]; then
>-  exec %{_bindir}/gsl-config-lib64 "\$@"
>-elif [ -e %{_bindir}/gsl-config-* ]; then
>-  gslcfile="\`ls %{_bindir}/gsl-config-* | head -n1\`"
>-  exec \$gslcfile "\$@" 
>-fi
>-EOF
>-chmod 755 $RPM_BUILD_ROOT%{_bindir}/gsl-config
>-
>-
> %post -p /sbin/ldconfig
> 
> %postun -p /sbin/ldconfig

Actions: View | Diff

Attachments on bug 225863: 147653 | 235541 | 245731