[dragonegg] Update Patch0.

Eric Smith brouhaha at fedoraproject.org
Tue Sep 9 23:44:10 UTC 2014 

commit f7d0b10e19de5c17b7759edb24bb9f5bc43bd42c
Author: Eric Smith <brouhaha at fedoraproject.org>
Date:   Tue Sep 9 17:44:03 2014 -0600

    Update Patch0.

 ...egg-3.3rc2-dyn.patch => dragonegg-3.4-dyn.patch |   17 ++--
 dragonegg.spec                                     |   80 ++++++++++----------
 2 files changed, 48 insertions(+), 49 deletions(-)
---
diff --git a/dragonegg-3.3rc2-dyn.patch b/dragonegg-3.4-dyn.patch
similarity index 52%
rename from dragonegg-3.3rc2-dyn.patch
rename to dragonegg-3.4-dyn.patch
index c9b60a8..670e93e 100644
--- a/dragonegg-3.3rc2-dyn.patch
+++ b/dragonegg-3.4-dyn.patch
@@ -1,7 +1,7 @@
-diff -up dragonegg-20140114/Makefile.dave dragonegg-20140114/Makefile
---- dragonegg-20140114/Makefile.dave	2014-01-14 16:20:34.000000000 +1000
-+++ dragonegg-20140114/Makefile	2014-01-14 16:21:38.000000000 +1000
-@@ -94,7 +94,7 @@ ifneq ($(GCC_MINOR), 5)
+diff -up dragonegg.src/Makefile.dyn dragonegg.src/Makefile
+--- dragonegg.src/Makefile.dyn	2013-05-21 10:16:37.000000000 -0600
++++ dragonegg.src/Makefile	2013-06-03 12:10:55.990785316 -0600
+@@ -95,7 +95,7 @@ ifneq ($(GCC_MINOR), 5)
    endif
  endif
  
@@ -10,22 +10,21 @@ diff -up dragonegg-20140114/Makefile.dave dragonegg-20140114/Makefile
  
  LLVM_COMPONENTS=ipo scalaropts target
  ifdef ENABLE_LLVM_PLUGINS
-@@ -132,9 +132,7 @@ $(TARGET_UTIL_OBJECTS): %.o : $(TOP_DIR)
+@@ -134,8 +134,7 @@ $(TARGET_UTIL_OBJECTS): %.o : $(TOP_DIR)
  
  $(TARGET_UTIL): $(TARGET_UTIL_OBJECTS)
  	@echo Linking $@
--	$(QUIET)$(CXX) -o $@ $^ \
--	$(shell $(LLVM_CONFIG) --libs support --system-libs) \
+-	$(QUIET)$(CXX) -o $@ $^ $(shell $(LLVM_CONFIG) --libs support) \
 -	$(LD_OPTIONS)
 +	$(QUIET)$(CXX) -o $@ $^ $(LD_OPTIONS)
  
  %.o : $(SRC_DIR)/%.cpp $(TARGET_UTIL)
  	@echo Compiling $*.cpp
-@@ -149,8 +147,6 @@ $(PLUGIN): $(PLUGIN_OBJECTS) $(TARGET_OB
+@@ -150,8 +149,6 @@ $(PLUGIN): $(PLUGIN_OBJECTS) $(TARGET_OB
  	@echo Linking $@
  	$(QUIET)$(CXX) -o $@ $(LOADABLE_MODULE_OPTIONS) $(CXXFLAGS) \
  	$(PLUGIN_OBJECTS) $(TARGET_OBJECT) \
--	$(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS) --system-libs \
+-	$(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS) \
 -	$(shell $(TARGET_UTIL) -p)) \
  	$(LD_OPTIONS)
  
diff --git a/dragonegg.spec b/dragonegg.spec
index 70c4526..455d555 100644
--- a/dragonegg.spec
+++ b/dragonegg.spec
@@ -54,7 +54,7 @@
 
 Name:           dragonegg
 Version:        3.4
-Release:        %{?prerel:0.}1%{?prerel:.}%{?prerel}%{?dist}.2
+Release:        %{?prerel:0.}3%{?prerel:.}%{?prerel}%{?dist}
 Summary:        GCC plugin to use LLVM optimizers and code generators
 
 Group:          Development/Languages
@@ -72,14 +72,12 @@ Source0:        %{downloadurl}/%{name}-%{version}%{?prerel}.src.tar.gz
 # which try to link the static LLVM libraries.  We want the shared library
 # instead, so we patch the Makefile and pass in suitable LDFLAGS on the
 # link command line.
-Patch0:         dragonegg-3.3rc2-dyn.patch
+Patch0:         dragonegg-3.4-dyn.patch
 
 # Correct a syntax error in include/arm/dragonegg/Target.h
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715424
 Patch1:         dragonegg-3.3-arm-target.patch
 
-#Patch2: backend-build-fix.patch
-
 Patch3: dragonegg-3.4-latest-gcc-build-fix.patch
 
 BuildRequires:  llvm-devel = %{version}
@@ -101,7 +99,6 @@ with those from the LLVM project.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .dyn 
 %patch1 -p1 -b .arm-target
-#%patch2 -p1 -b .backend
 %patch3 -p1 -b .abihack
 
 %build
@@ -121,10 +118,13 @@ install -m 755 dragonegg.so %{buildroot}%{gcc_plugins_dir}
 
 
 %changelog
+* Tue Sep 09 2014 Eric Smith <brouhaha at fedoraproject.org> - 3.4-3
+- Update Patch0. Still FTBFS in F21, rawhide, bug #1094531.
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Thu Jul 17 2014 Eric Smith <spacewar at gmail.com> - 3.4-1
+* Thu Jul 17 2014 Eric Smith <brouhaha at fedoraproject.org> - 3.4-1
 - Updated to latest upstream. Rebuild for gcc-4.9.1-2.
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-0.3.rc0.1
@@ -141,31 +141,31 @@ install -m 755 dragonegg.so %{buildroot}%{gcc_plugins_dir}
 * Tue Jan 14 2014 Dave Airlie <airlied at redhat.com> 3.4-0.1
 - rebase to latest git for llvm 3.4
 
-* Tue Dec 31 2013 Eric Smith <spacewar at gmail.com> - 3.3-12
+* Tue Dec 31 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-12
 - Rebuild for gcc-4.8.2-7.
 
 * Thu Oct 17 2013 Jakub Jelinek <jakub at redhat.com> - 3.3-11
 - Rebuild for gcc-4.8.2-1.
 
-* Sat Sep 21 2013 Eric Smith <spacewar at gmail.com> - 3.3-10
+* Sat Sep 21 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-10
 - Rebuild for gcc-4.8.1-10.fc21.
 
-* Mon Sep 16 2013 Eric Smith <spacewar at gmail.com> - 3.3-9
+* Mon Sep 16 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-9
 - Rebuild for gcc-4.8.1-9.fc21.
 
-* Tue Sep 10 2013 Eric Smith <spacewar at gmail.com> - 3.3-8
+* Tue Sep 10 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-8
 - Rebuild for gcc-4.8.1-8.fc21.
 
-* Fri Sep 06 2013 Eric Smith <spacewar at gmail.com> - 3.3-7
+* Fri Sep 06 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-7
 - Rebuild for gcc-4.8.1-7.fc21.
 
-* Thu Aug 15 2013 Eric Smith <spacewar at gmail.com> - 3.3-6
+* Thu Aug 15 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-6
 - Rebuild for gcc-4.8.1-6.fc20.
 
-* Thu Aug 08 2013 Eric Smith <spacewar at gmail.com> - 3.3-5
+* Thu Aug 08 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-5
 - Rebuild for gcc-4.8.1-5.fc20.1.
 
-* Sat Aug 03 2013 Eric Smith <spacewar at gmail.com> - 3.3-4
+* Sat Aug 03 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-4
 - LLVM package no longer has ExcludeArch s390 s390x ppc ppc64, so removed here
   also.
 - Added patch for one ARM build problem, but still fails, so adding
@@ -174,87 +174,87 @@ install -m 755 dragonegg.so %{buildroot}%{gcc_plugins_dir}
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Sat Jul 20 2013 Eric Smith <spacewar at gmail.com> - 3.3-3
+* Sat Jul 20 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-3
 - Rebuild for gcc-4.8.1-5.fc20.
 
-* Wed Jul 17 2013 Eric Smith <spacewar at gmail.com> - 3.3-2
+* Wed Jul 17 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-2
 - Rebuild for gcc-4.8.1-4.fc20.
 
-* Tue Jun 18 2013 Eric Smith <spacewar at gmail.com> - 3.3-1
+* Tue Jun 18 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-1
 - Updated to latest upstream.
 
-* Thu Jun 13 2013 Eric Smith <spacewar at gmail.com> - 3.3-0.4.rc3
+* Thu Jun 13 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-0.4.rc3
 - Rebuild for gcc-4.8.1-2.fc20.
 
-* Fri Jun 07 2013 Eric Smith <eric at brouhaha.com> - 3.3-0.3.rc3
+* Fri Jun 07 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-0.3.rc3
 - Updated to latest upstream.
 
 * Tue Jun 04 2013 Eric Smith <brouhaha at fedoraproject.org> - 3.3-0.2.rc2
 - Rebuild for gcc-4.8.1-1.fc20.
 
-* Mon Jun 03 2013 Eric Smith <eric at brouhaha.com> - 3.3-0.1.rc2
+* Mon Jun 03 2013 Eric Smith <brouhaha at gedoraproject.org> - 3.3-0.1.rc2
 - Updated to latest upstream.
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Fri Dec 07 2012 Eric Smith <eric at brouhaha.com> - 3.1-19
+* Fri Dec 07 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-19
 - Rebuild for gcc-4.7.2-9.fc19.
 
-* Thu Nov 22 2012 Eric Smith <eric at brouhaha.com> - 3.1-18
+* Thu Nov 22 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-18
 - Fixed gcc dependency.
 
-* Sun Nov 11 2012 Eric Smith <eric at brouhaha.com> - 3.1-17
+* Sun Nov 11 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-17
 - Rebuild for gcc-4.7.2-8.fc19.
 
-* Fri Nov 09 2012 Eric Smith <eric at brouhaha.com> - 3.1-16
+* Fri Nov 09 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-16
 - Rebuild for gcc-4.7.2-7.fc19.
 
-* Sat Oct 27 2012 Eric Smith <eric at brouhaha.com> - 3.1-15
+* Sat Oct 27 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-15
 - Add BuildRequires for Python. Previously it was getting pulled in as
   a dependency of something else, but that's stopped happening.
 
-* Sat Oct 20 2012 Eric Smith <eric at brouhaha.com> - 3.1-14
+* Sat Oct 20 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-14
 - Rebuild for gcc-4.7.2-6.fc19.
 
-* Wed Oct 10 2012 Eric Smith <eric at brouhaha.com> - 3.1-13
+* Wed Oct 10 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-13
 - Rebuild for gcc 4.7.2-4.fc19.
 
-* Tue Oct 09 2012 Eric Smith <eric at brouhaha.com> - 3.1-12
+* Tue Oct 09 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-12
 - Rebuild for gcc 4.7.2-3.fc19.
 
-* Sun Sep 23 2012 Eric Smith <eric at brouhaha.com> - 3.1-11
+* Sun Sep 23 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-11
 - Rebuild for gcc 4.7.2-1.fc19.
 
-* Fri Sep 14 2012 Eric Smith <eric at brouhaha.com> - 3.1-10
+* Fri Sep 14 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-10
 - Rebuild for gcc-4.7.1-8.fc19.
 
-* Thu Aug 16 2012 Eric Smith <eric at brouhaha.com> - 3.1-9
+* Thu Aug 16 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-9
 - Rebuild for gcc-4.7.1-7.fc19.
 
-* Fri Aug 10 2012 Eric Smith <eric at brouhaha.com> - 3.1-8
+* Fri Aug 10 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-8
 - Rebuild for gcc-4.7.1-5.
 
-* Thu Aug 09 2012 Eric Smith <eric at brouhaha.com> - 3.1-7
+* Thu Aug 09 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-7
 - Rebuild for libffi update.
 
-* Sat Aug 04 2012 Eric Smith <eric at brouhaha.com> - 3.1-6
+* Sat Aug 04 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-6
 - Rebuild for gcc-4.7.1-5.fc18.
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Mon Jul 16 2012 Eric Smith <eric at brouhaha.com> - 3.1-4
+* Mon Jul 16 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-4
 - Rebuilt for gcc-4.7.1-2.fc18.
 
-* Mon Jul 09 2012 Eric Smith <eric at brouhaha.com> - 3.1-3
+* Mon Jul 09 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-3
 - Rebuilt for gcc-4.7.1-1.fc18.
 
-* Tue Jun 12 2012 Eric Smith <eric at brouhaha.com> - 3.1-2
+* Tue Jun 12 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-2
 - Rawhide gcc still has fc17 dist tag, so temporary changed the
   gcc dependency macros to use fc17.
 
-* Wed May 23 2012 Eric Smith <eric at brouhaha.com> - 3.1-1
+* Wed May 23 2012 Eric Smith <brouhaha at fedoraproject.org> - 3.1-1
 - Updated to latest upstream.
 - Added ExcludeArch to avoid building on architectures for which LLVM is
   not built.  It seems to me that it should be possible to build LLVM on
@@ -262,8 +262,8 @@ install -m 755 dragonegg.so %{buildroot}%{gcc_plugins_dir}
   isn't being done.  Note that we currently don't build for any EPEL
   because no EPEL provides a new enough LLVM.  Maybe someday.
 
-* Sat Dec 03 2011 Eric Smith <eric at brouhaha.com> - 3.0-1
+* Sat Dec 03 2011 Eric Smith <brouhaha at fedoraproject.org> - 3.0-1
 - Update to upstream final release
 
-* Fri Dec 02 2011 Eric Smith <eric at brouhaha.com> - 3.0-0.1.rc3
+* Fri Dec 02 2011 Eric Smith <brouhaha at fedoraproject.org> - 3.0-0.1.rc3
 - Initial version

More information about the scm-commits mailing list