| 1 |
bicatali 13/02/25 04:45:40 |
| 2 |
|
| 3 |
Added: root-5.34.05-nobyte-compile.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-physics/root/files/root-5.34.05-nobyte-compile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.05-nobyte-compile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.05-nobyte-compile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: root-5.34.05-nobyte-compile.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur root.as-needed/Makefile root/Makefile |
| 18 |
--- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400 |
| 19 |
+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400 |
| 20 |
@@ -1258,10 +1258,7 @@ |
| 21 |
for lib in $(RFLX_GRFLXPY); do \ |
| 22 |
rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ |
| 23 |
done; \ |
| 24 |
- for lib in $(RFLX_GRFLXPYC); do \ |
| 25 |
- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ |
| 26 |
- done; \ |
| 27 |
- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ |
| 28 |
+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ |
| 29 |
dir=$(subst lib/,,$(RFLX_GRFLXDD)); \ |
| 30 |
while test "x$${dir}" != "x" && \ |
| 31 |
test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ |
| 32 |
diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk |
| 33 |
--- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 |
| 34 |
+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 |
| 35 |
@@ -48,8 +48,6 @@ |
| 36 |
ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) |
| 37 |
$(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ |
| 38 |
endif |
| 39 |
-ROOTPYC := $(ROOTPY:.py=.pyc) |
| 40 |
-ROOTPYO := $(ROOTPY:.py=.pyo) |
| 41 |
|
| 42 |
# used in the main Makefile |
| 43 |
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) |
| 44 |
@@ -68,10 +66,8 @@ |
| 45 |
include/%.h: $(PYROOTDIRI)/%.h |
| 46 |
cp $< $@ |
| 47 |
|
| 48 |
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
| 49 |
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
| 50 |
|
| 51 |
-$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ |
| 52 |
+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ |
| 53 |
$(ROOTLIBSDEP) $(PYTHONLIBDEP) |
| 54 |
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ |
| 55 |
"$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ |
| 56 |
@@ -113,7 +109,7 @@ |
| 57 |
|
| 58 |
distclean-$(MODNAME): clean-$(MODNAME) |
| 59 |
@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ |
| 60 |
- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ |
| 61 |
+ $(ROOTPY) $(PYROOTMAP) \ |
| 62 |
$(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) |
| 63 |
|
| 64 |
distclean:: distclean-$(MODNAME) |
| 65 |
diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules |
| 66 |
--- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 |
| 67 |
+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 |
| 68 |
@@ -691,10 +691,6 @@ |
| 69 |
-X$(SYSCONFDIR)/root/system.rootauthrc \ |
| 70 |
-X$(SYSCONFDIR)/root/system.rootdaemonrc \ |
| 71 |
-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ |
| 72 |
- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ |
| 73 |
- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ |
| 74 |
- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ |
| 75 |
- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ |
| 76 |
-X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ |
| 77 |
-X$(PREFIX)/include/root/Minuit2 |
| 78 |
# $(foreach i, \ |
| 79 |
diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk |
| 80 |
--- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 |
| 81 |
+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 |
| 82 |
@@ -31,10 +31,6 @@ |
| 83 |
CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) |
| 84 |
$(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ |
| 85 |
endif |
| 86 |
-ifneq ($(BUILDPYTHON),no) |
| 87 |
-CINTEXPYC := $(CINTEXPY:.py=.pyc) |
| 88 |
-CINTEXPYO := $(CINTEXPY:.py=.pyo) |
| 89 |
-endif |
| 90 |
|
| 91 |
# used in the main Makefile |
| 92 |
ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) |
| 93 |
@@ -86,8 +82,6 @@ |
| 94 |
fi) |
| 95 |
cp $< $@ |
| 96 |
|
| 97 |
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
| 98 |
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
| 99 |
|
| 100 |
$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ |
| 101 |
$(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) |
| 102 |
diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk |
| 103 |
--- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 |
| 104 |
+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 |
| 105 |
@@ -48,9 +48,6 @@ |
| 106 |
RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) |
| 107 |
RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) |
| 108 |
RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) |
| 109 |
-ifneq ($(BUILDPYTHON),no) |
| 110 |
-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) |
| 111 |
-endif |
| 112 |
|
| 113 |
RFLX_LIBDIR = $(LIBDIR) |
| 114 |
|
| 115 |
@@ -92,7 +89,7 @@ |
| 116 |
|
| 117 |
ALLEXECS += $(RFLX_GENMAPX) |
| 118 |
|
| 119 |
-POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) |
| 120 |
+POSTBIN += $(RFLX_GRFLXPY) |
| 121 |
|
| 122 |
##### local rules ##### |
| 123 |
.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ |
| 124 |
@@ -122,8 +119,6 @@ |
| 125 |
mkdir -p lib/python/genreflex; fi ) |
| 126 |
cp $< $@ |
| 127 |
|
| 128 |
-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py |
| 129 |
- @python -c 'import py_compile; py_compile.compile( "$<" )' |
| 130 |
|
| 131 |
$(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap |
| 132 |
|
| 133 |
@@ -149,7 +144,7 @@ |
| 134 |
$(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ |
| 135 |
-d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) |
| 136 |
|
| 137 |
-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) |
| 138 |
+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) |
| 139 |
|
| 140 |
clean-genreflex: |
| 141 |
@rm -rf lib/python/genreflex |
| 142 |
diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt |
| 143 |
--- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 |
| 144 |
+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 |
| 145 |
@@ -15,7 +15,7 @@ |
| 146 |
##################### sources #################### |
| 147 |
|
| 148 |
FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) |
| 149 |
-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) |
| 150 |
+SET(GENREFLEX_SCRIPT PARENT_SCOPE) |
| 151 |
|
| 152 |
##################### gccxmlpath #################### |
Archives