rpms/flac/devel flac-1.1.2-libtool.patch, 1.2, 1.3 flac.spec, 1.11, 1.12

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 28 20:00:22 UTC 2005 

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23674

Modified Files:
	flac-1.1.2-libtool.patch flac.spec 
Log Message:
- fix compile error on x86_64


flac-1.1.2-libtool.patch:
 configure.in            |    4 ++--
 src/libFLAC/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: flac-1.1.2-libtool.patch
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac-1.1.2-libtool.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flac-1.1.2-libtool.patch	28 Mar 2005 19:07:14 -0000	1.2
+++ flac-1.1.2-libtool.patch	28 Mar 2005 20:00:13 -0000	1.3
@@ -1,82 +1,17 @@
---- flac-1.1.2/src/libFLAC/Makefile.in.libtool	2005-03-28 14:04:17.247084000 -0500
-+++ flac-1.1.2/src/libFLAC/Makefile.in	2005-03-28 14:05:04.911372000 -0500
-@@ -304,7 +304,6 @@
- @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ia32/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
-- at FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
- SUBDIRS = $(ARCH_SUBDIRS) include .
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libFLAC.m4
---- flac-1.1.2/src/share/getopt/Makefile.in.libtool	2005-02-04 21:23:48.000000000 -0500
-+++ flac-1.1.2/src/share/getopt/Makefile.in	2005-03-28 14:02:19.629819000 -0500
-@@ -83,7 +83,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
---- flac-1.1.2/src/share/replaygain_analysis/Makefile.in.libtool	2005-02-04 21:23:49.000000000 -0500
-+++ flac-1.1.2/src/share/replaygain_analysis/Makefile.in	2005-03-28 14:02:19.743705000 -0500
-@@ -81,7 +81,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
---- flac-1.1.2/src/share/replaygain_synthesis/Makefile.in.libtool	2005-02-04 21:23:49.000000000 -0500
-+++ flac-1.1.2/src/share/replaygain_synthesis/Makefile.in	2005-03-28 14:02:19.864584000 -0500
-@@ -88,7 +88,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
---- flac-1.1.2/src/share/grabbag/Makefile.in.libtool	2005-02-04 21:23:48.000000000 -0500
-+++ flac-1.1.2/src/share/grabbag/Makefile.in	2005-03-28 14:02:19.978470000 -0500
-@@ -83,7 +83,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
---- flac-1.1.2/src/share/utf8/Makefile.in.libtool	2005-02-04 21:23:51.000000000 -0500
-+++ flac-1.1.2/src/share/utf8/Makefile.in	2005-03-28 14:02:20.090358000 -0500
-@@ -81,7 +81,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
---- flac-1.1.2/src/plugin_common/Makefile.in.libtool	2005-02-04 21:23:45.000000000 -0500
-+++ flac-1.1.2/src/plugin_common/Makefile.in	2005-03-28 14:02:20.184264000 -0500
-@@ -101,7 +101,7 @@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
---- flac-1.1.2/configure.libtool	2005-02-04 21:22:32.000000000 -0500
-+++ flac-1.1.2/configure	2005-03-28 14:02:20.463984000 -0500
-@@ -10541,9 +10541,9 @@
+--- flac-1.1.2/src/libFLAC/Makefile.am.moo	2005-03-28 14:40:52.665468000 -0500
++++ flac-1.1.2/src/libFLAC/Makefile.am	2005-03-28 14:41:40.414671000 -0500
+@@ -64,7 +64,7 @@
+ libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
+ endif
+ endif
+-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
++#LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+ endif
+ endif
+ 
+--- flac-1.1.2/configure.in.moo	2005-03-28 14:48:06.733965000 -0500
++++ flac-1.1.2/configure.in	2005-03-28 14:48:25.641039000 -0500
+@@ -200,9 +200,9 @@
  if test x$debug = xtrue; then
  	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
  else
@@ -84,7 +19,7 @@
 +	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
  	if test x$GCC = xyes; then
 -		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
-+		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
++		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -Winline -DFLaC__INLINE=__inline__"
  	fi
  fi
  CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- flac.spec	28 Mar 2005 19:07:14 -0000	1.11
+++ flac.spec	28 Mar 2005 20:00:13 -0000	1.12
@@ -11,7 +11,7 @@
 Patch3: flac-1.1.0-gnu-stack.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: xmms-devel, glib-devel, libogg-devel, doxygen, nasm
+BuildRequires: xmms-devel, glib-devel, libogg-devel, doxygen, nasm, autoconf, automake
 Obsoletes: flac-libs
 
 %description
@@ -48,8 +48,11 @@
 %patch1 -p1 -b .libtool
 %patch3 -p1 -b .gnu-stack
 
+autoreconf -i -f
+
 %build
-%configure
+%configure --with-pic
+
 make %{?_smp_mflags}
 
 %install

More information about the fedora-cvs-commits mailing list