[dragonegg] Revert "Update for EL7 LLVM 3.4.2 and GCC 4.8.2-16.2.el7_0."
Eric Smith
brouhaha at fedoraproject.org
Sat Aug 30 06:03:51 UTC 2014
commit 291292f7a80aef83013db308f78fb5acbec5a604
Author: Eric Smith <eric at localhost.localdomain>
Date: Sat Aug 30 00:03:36 2014 -0600
Revert "Update for EL7 LLVM 3.4.2 and GCC 4.8.2-16.2.el7_0."
This reverts commit 61c5d0fa98823fe1d15a5237eef69418c022a215.
...egg-3.4-dyn.patch => dragonegg-3.3rc2-dyn.patch | 17 +++++++++--------
dragonegg.spec | 19 ++++---------------
2 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/dragonegg-3.4-dyn.patch b/dragonegg-3.3rc2-dyn.patch
similarity index 52%
rename from dragonegg-3.4-dyn.patch
rename to dragonegg-3.3rc2-dyn.patch
index 2643723..c9b60a8 100644
--- a/dragonegg-3.4-dyn.patch
+++ b/dragonegg-3.3rc2-dyn.patch
@@ -1,7 +1,7 @@
-diff -up dragonegg-3.4/Makefile.dyn dragonegg-3.4/Makefile
---- dragonegg-3.4/Makefile.dyn 2013-08-08 14:13:12.000000000 -0600
-+++ dragonegg-3.4/Makefile 2014-08-29 23:42:53.101970550 -0600
-@@ -95,7 +95,7 @@ ifneq ($(GCC_MINOR), 5)
+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)
endif
endif
@@ -10,21 +10,22 @@ diff -up dragonegg-3.4/Makefile.dyn dragonegg-3.4/Makefile
LLVM_COMPONENTS=ipo scalaropts target
ifdef ENABLE_LLVM_PLUGINS
-@@ -133,8 +133,7 @@ $(TARGET_UTIL_OBJECTS): %.o : $(TOP_DIR)
+@@ -132,9 +132,7 @@ $(TARGET_UTIL_OBJECTS): %.o : $(TOP_DIR)
$(TARGET_UTIL): $(TARGET_UTIL_OBJECTS)
@echo Linking $@
-- $(QUIET)$(CXX) -o $@ $^ $(shell $(LLVM_CONFIG) --libs support) \
+- $(QUIET)$(CXX) -o $@ $^ \
+- $(shell $(LLVM_CONFIG) --libs support --system-libs) \
- $(LD_OPTIONS)
+ $(QUIET)$(CXX) -o $@ $^ $(LD_OPTIONS)
%.o : $(SRC_DIR)/%.cpp $(TARGET_UTIL)
@echo Compiling $*.cpp
-@@ -149,8 +148,6 @@ $(PLUGIN): $(PLUGIN_OBJECTS) $(TARGET_OB
+@@ -149,8 +147,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) \
+- $(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS) --system-libs \
- $(shell $(TARGET_UTIL) -p)) \
$(LD_OPTIONS)
diff --git a/dragonegg.spec b/dragonegg.spec
index 47802c8..70c4526 100644
--- a/dragonegg.spec
+++ b/dragonegg.spec
@@ -40,12 +40,7 @@
%global gcc_dist %{dist}
#global gcc_dist_minor 1
-#global gcc_vr %(gcc --version | python -c "import re; import sys; print(re.match(r'.*\\(Red Hat (.+)\\).*', sys.stdin.read()).group(1))")%{gcc_dist}%{?gcc_dist_minor:.%{gcc_dist_minor}}
-
-# The above doesn't work for CentOS 7/EL 7, due to the ".2" in the release,
-# and an underscore zero in the release tag (16.2.el7_0),
-# so unfortunately we have to totally hardcode it.
-%global gcc_vr 4.8.2-16.2.el7_0
+%global gcc_vr %(gcc --version | python -c "import re; import sys; print(re.match(r'.*\\(Red Hat (.+)\\).*', sys.stdin.read()).group(1))")%{gcc_dist}%{?gcc_dist_minor:.%{gcc_dist_minor}}
# Define a boolean to make it easy to turn the above off, in case it fails:
%global with_hard_gcc_version_requirement 1
@@ -57,8 +52,6 @@
%global gcc_plugins_dir %(gcc --print-file-name=plugin)
-%global llvm_version 3.4.2
-
Name: dragonegg
Version: 3.4
Release: %{?prerel:0.}1%{?prerel:.}%{?prerel}%{?dist}.2
@@ -79,7 +72,7 @@ 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.4-dyn.patch
+Patch0: dragonegg-3.3rc2-dyn.patch
# Correct a syntax error in include/arm/dragonegg/Target.h
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715424
@@ -89,9 +82,8 @@ Patch1: dragonegg-3.3-arm-target.patch
Patch3: dragonegg-3.4-latest-gcc-build-fix.patch
-BuildRequires: llvm-devel = %{llvm_version}
-BuildRequires: llvm-libs = %{llvm_version}
-BuildRequires: gcc-c++
+BuildRequires: llvm-devel = %{version}
+BuildRequires: llvm-libs = %{version}
BuildRequires: gcc-plugin-devel
BuildRequires: python
@@ -129,9 +121,6 @@ install -m 755 dragonegg.so %{buildroot}%{gcc_plugins_dir}
%changelog
-* Fri Aug 29 2014 Eric Smith <spacewar at gmail.com> - 3.4-2
-- Rebuild for llvm-3.4.2, gcc-4.8.2-16.2.el7_0.
-
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list