| 1 |
jlec 10/06/25 17:12:37 |
| 2 |
|
| 3 |
Added: root-5.26.00-nobyte-compile.patch |
| 4 |
Log: |
| 5 |
Fixes for PYTHON ABIs |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-physics/root/files/root-5.26.00-nobyte-compile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.26.00-nobyte-compile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.26.00-nobyte-compile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: root-5.26.00-nobyte-compile.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/Makefile b/Makefile |
| 17 |
index c352a18..ca938d2 100644 |
| 18 |
--- a/Makefile |
| 19 |
+++ b/Makefile |
| 20 |
@@ -1080,10 +1080,7 @@ uninstall: |
| 21 |
if test "x$(RFLX_GRFLXPY)" != "x"; then \ |
| 22 |
rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ |
| 23 |
fi; \ |
| 24 |
- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ |
| 25 |
- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ |
| 26 |
- fi; \ |
| 27 |
- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ |
| 28 |
+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ |
| 29 |
dir=$(RFLX_GRFLXDD:lib/=); \ |
| 30 |
while test "x$${dir}" != "x" && \ |
| 31 |
test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ |
| 32 |
diff --git a/bindings/pyroot/Module.mk b/bindings/pyroot/Module.mk |
| 33 |
index 1b5b602..7028df2 100644 |
| 34 |
--- a/bindings/pyroot/Module.mk |
| 35 |
+++ b/bindings/pyroot/Module.mk |
| 36 |
@@ -48,8 +48,6 @@ else |
| 37 |
ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) |
| 38 |
$(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ |
| 39 |
endif |
| 40 |
-ROOTPYC := $(ROOTPY:.py=.pyc) |
| 41 |
-ROOTPYO := $(ROOTPY:.py=.pyo) |
| 42 |
|
| 43 |
# used in the main Makefile |
| 44 |
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) |
| 45 |
@@ -68,10 +66,8 @@ INCLUDEFILES += $(PYROOTDEP) |
| 46 |
include/%.h: $(PYROOTDIRI)/%.h |
| 47 |
cp $< $@ |
| 48 |
|
| 49 |
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
| 50 |
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
| 51 |
|
| 52 |
-$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ |
| 53 |
+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ |
| 54 |
$(ROOTLIBSDEP) $(PYTHONLIBDEP) |
| 55 |
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ |
| 56 |
"$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ |
| 57 |
@@ -112,7 +108,7 @@ clean:: clean-$(MODNAME) |
| 58 |
|
| 59 |
distclean-$(MODNAME): clean-$(MODNAME) |
| 60 |
@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ |
| 61 |
- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ |
| 62 |
+ $(ROOTPY) $(PYROOTMAP) \ |
| 63 |
$(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) |
| 64 |
|
| 65 |
distclean:: distclean-$(MODNAME) |
| 66 |
diff --git a/build/package/debian/rules b/build/package/debian/rules |
| 67 |
index c999032..75b51c3 100644 |
| 68 |
--- a/build/package/debian/rules |
| 69 |
+++ b/build/package/debian/rules |
| 70 |
@@ -624,10 +624,6 @@ install-arch: |
| 71 |
-X$(SYSCONFDIR)/root/system.rootauthrc \ |
| 72 |
-X$(SYSCONFDIR)/root/system.rootdaemonrc \ |
| 73 |
-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ |
| 74 |
- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ |
| 75 |
- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ |
| 76 |
- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ |
| 77 |
- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo |
| 78 |
# $(foreach i, \ |
| 79 |
# $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \ |
| 80 |
# -X$(i:$(DTMP)/%=%) ) |
| 81 |
diff --git a/cint/cintex/Module.mk b/cint/cintex/Module.mk |
| 82 |
index 556b37b..547b53a 100644 |
| 83 |
--- a/cint/cintex/Module.mk |
| 84 |
+++ b/cint/cintex/Module.mk |
| 85 |
@@ -31,10 +31,6 @@ else |
| 86 |
CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) |
| 87 |
$(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ |
| 88 |
endif |
| 89 |
-ifneq ($(BUILDPYTHON),no) |
| 90 |
-CINTEXPYC := $(CINTEXPY:.py=.pyc) |
| 91 |
-CINTEXPYO := $(CINTEXPY:.py=.pyo) |
| 92 |
-endif |
| 93 |
|
| 94 |
# used in the main Makefile |
| 95 |
ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) |
| 96 |
@@ -86,8 +82,6 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h |
| 97 |
fi) |
| 98 |
cp $< $@ |
| 99 |
|
| 100 |
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
| 101 |
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
| 102 |
|
| 103 |
$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ |
| 104 |
$(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) |
| 105 |
diff --git a/cint/cintexcompat/Module.mk b/cint/cintexcompat/Module.mk |
| 106 |
index 03423b7..e7f2a3a 100644 |
| 107 |
--- a/cint/cintexcompat/Module.mk |
| 108 |
+++ b/cint/cintexcompat/Module.mk |
| 109 |
@@ -31,10 +31,6 @@ else |
| 110 |
CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) |
| 111 |
$(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ |
| 112 |
endif |
| 113 |
-ifneq ($(BUILDPYTHON),no) |
| 114 |
-CINTEXPYC := $(CINTEXPY:.py=.pyc) |
| 115 |
-CINTEXPYO := $(CINTEXPY:.py=.pyo) |
| 116 |
-endif |
| 117 |
|
| 118 |
# used in the main Makefile |
| 119 |
ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) |
| 120 |
@@ -86,12 +82,10 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h |
| 121 |
fi) |
| 122 |
cp $< $@ |
| 123 |
|
| 124 |
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' |
| 125 |
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' |
| 126 |
|
| 127 |
ifeq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),) |
| 128 |
# Avoid conflict with cintex/Module.mk |
| 129 |
-$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ |
| 130 |
+$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) \ |
| 131 |
$(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) |
| 132 |
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ |
| 133 |
"$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \ |
| 134 |
@@ -113,7 +107,7 @@ clean-check-$(MODNAME): |
| 135 |
clean:: clean-$(MODNAME) |
| 136 |
|
| 137 |
distclean-$(MODNAME): clean-$(MODNAME) |
| 138 |
- @rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) |
| 139 |
+ @rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) |
| 140 |
@rm -rf include/Cintex |
| 141 |
|
| 142 |
distclean:: distclean-$(MODNAME) |
| 143 |
diff --git a/cint/reflex/Module.mk b/cint/reflex/Module.mk |
| 144 |
index 71a4abc..27f3065 100644 |
| 145 |
--- a/cint/reflex/Module.mk |
| 146 |
+++ b/cint/reflex/Module.mk |
| 147 |
@@ -48,9 +48,6 @@ RFLX_GCCXMLPATHPY := $(RFLX_GRFLXDD)/gccxmlpath.py |
| 148 |
RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) |
| 149 |
RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) |
| 150 |
RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) |
| 151 |
-ifneq ($(BUILDPYTHON),no) |
| 152 |
-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) |
| 153 |
-endif |
| 154 |
|
| 155 |
RFLX_LIBDIR = $(LIBDIR) |
| 156 |
|
| 157 |
@@ -97,7 +94,7 @@ ALLEXECS += $(RFLX_GENMAPX) |
| 158 |
.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ |
| 159 |
clean-check-$(MODNAME) check-$(MODNAME) clean-genreflex |
| 160 |
|
| 161 |
-POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) |
| 162 |
+POSTBIN += $(RFLX_GRFLXPY) |
| 163 |
|
| 164 |
include/Reflex/%.h: $(REFLEXDIRI)/Reflex/%.h |
| 165 |
@(if [ ! -d "include/Reflex" ]; then \ |
| 166 |
@@ -123,8 +120,6 @@ $(RFLX_GRFLXDD)/%.py: $(RFLX_GRFLXSD)/%.py $(RFLX_GCCXMLPATHPY) |
| 167 |
mkdir -p lib/python/genreflex; fi ) |
| 168 |
cp $< $@ |
| 169 |
|
| 170 |
-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py |
| 171 |
- @python -c 'import py_compile; py_compile.compile( "$<" )' |
| 172 |
|
| 173 |
$(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap |
| 174 |
|
| 175 |
@@ -149,7 +144,7 @@ $(REFLEXDICTMAP): bin/rlibmap$(EXEEXT) $(MAKEFILEDEP) $(REFLEXL) |
| 176 |
$(RLIBMAP) -o $(REFLEXDICTMAP) -l $(REFLEXDICTLIB) \ |
| 177 |
-d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) |
| 178 |
|
| 179 |
-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) |
| 180 |
+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) |
| 181 |
|
| 182 |
clean-genreflex: |
| 183 |
@rm -rf lib/python/genreflex |
| 184 |
diff --git a/cint/reflex/python/CMakeLists.txt b/cint/reflex/python/CMakeLists.txt |
| 185 |
index b1faf57..55062b8 100644 |
| 186 |
--- a/cint/reflex/python/CMakeLists.txt |
| 187 |
+++ b/cint/reflex/python/CMakeLists.txt |
| 188 |
@@ -15,7 +15,7 @@ ENDIF (NOT PYTHONINTERP_FOUND) |
| 189 |
##################### sources #################### |
| 190 |
|
| 191 |
FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) |
| 192 |
-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) |
| 193 |
+SET(GENREFLEX_SCRIPT PARENT_SCOPE) |
| 194 |
|
| 195 |
##################### gccxmlpath #################### |
Archives