[par2cmdline: 1/3] Fix the build on modern gcc

epienbro epienbro at fedoraproject.org
Fri Jan 13 18:55:57 UTC 2012


commit d5f139e675a634a3fcced56019ff8792063204d9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Jan 13 19:48:06 2012 +0100

    Fix the build on modern gcc

 par2cmdline-Makefile.am.patch     | 1139 -------------------------------------
 par2cmdline-fix-dso-linking.patch |   11 +
 par2cmdline-packed.patch          |  219 -------
 par2cmdline-reedsolomon.cpp.patch |   51 --
 par2cmdline.spec                  |    5 +
 5 files changed, 16 insertions(+), 1409 deletions(-)
---
diff --git a/par2cmdline-fix-dso-linking.patch b/par2cmdline-fix-dso-linking.patch
index a3c0486..1750340 100644
--- a/par2cmdline-fix-dso-linking.patch
+++ b/par2cmdline-fix-dso-linking.patch
@@ -9,3 +9,14 @@
  @PLATFORM_DARWIN_TRUE at AM_CXXFLAGS = -Wall \
  @PLATFORM_DARWIN_TRUE@	-I$(top_srcdir)/../tbb21_009oss/include \
  @PLATFORM_DARWIN_TRUE@	-gfull -O3 -fvisibility=hidden \
+--- Makefile.am.orig	2011-07-31 14:29:49.269382440 +0200
++++ Makefile.am	2011-07-31 14:30:03.060613129 +0200
+@@ -111,7 +111,7 @@
+ 	verificationpacket.cpp verificationpacket.h \
+ 	$(ASMSOURCES) $(GPGPU_SOURCES)
+ 
+-LDADD = -lstdc++ -ltbb -L.
++LDADD = -lstdc++ -ltbb -lrt -L.
+ if PLATFORM_DARWIN
+ AM_CXXFLAGS = -Wall -I$(top_srcdir)/../tbb22_20090809oss_src/include -gfull -O3 -fvisibility=hidden -fvisibility-inlines-hidden $(CXXFLAGS_DARWIN) $(AM_CXXFLAGS_GPGPU) $(FLAGS_ARCH)
+ if AMD64
diff --git a/par2cmdline.spec b/par2cmdline.spec
index dad2304..00c285f 100644
--- a/par2cmdline.spec
+++ b/par2cmdline.spec
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      parchive <= 1.1.4
 Provides:       parchive = 1.1.4.0.par2.%{version}
 
+BuildRequires:  autoconf automake libtool
 %ifarch %{ix86} x86_64
 BuildRequires:  tbb-devel
 %endif
@@ -53,6 +54,10 @@ sed -i s/-ltbb/-lrt/ Makefile.in
 # fix end-of-lines of several files
 sed -i 's/\r//' AUTHORS PORTING README ROADMAP
 
+# Regenerate the Makefiles
+libtoolize --copy --force
+autoreconf --install --force
+
 
 %build
 %configure


More information about the scm-commits mailing list