[gentoo-commits] gentoo-x86 commit in sci-physics/root/files: root-5.26.00-nobyte-compile.patch

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Justin Lecher (jlec)" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sci-physics/root/files: root-5.26.00-nobyte-compile.patch
Date: Fri, 25 Jun 2010 17:12:37 +0000 (UTC)	[thread overview]
Message-ID: <20100625171237.2AD5D2CF63@corvid.gentoo.org> (raw)

jlec        10/06/25 17:12:37

  Added:                root-5.26.00-nobyte-compile.patch
  Log:
  Fixes for PYTHON ABIs
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-physics/root/files/root-5.26.00-nobyte-compile.patch

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
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

Index: root-5.26.00-nobyte-compile.patch
===================================================================
diff --git a/Makefile b/Makefile
index c352a18..ca938d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1080,10 +1080,7 @@ uninstall:
 	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
 	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
 	   fi; \
-	   if test "x$(RFLX_GRFLXPYC)" != "x"; then \
-	      rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
-	   fi; \
-	   if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
+	   if test "x$(RFLX_GRFLXPY)" != "x"; then \
 	      dir=$(RFLX_GRFLXDD:lib/=); \
 	      while test "x$${dir}" != "x" && \
 	         test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
diff --git a/bindings/pyroot/Module.mk b/bindings/pyroot/Module.mk
index 1b5b602..7028df2 100644
--- a/bindings/pyroot/Module.mk
+++ b/bindings/pyroot/Module.mk
@@ -48,8 +48,6 @@ else
 ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
 $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
 endif
-ROOTPYC      := $(ROOTPY:.py=.pyc)
-ROOTPYO      := $(ROOTPY:.py=.pyo)
 
 # used in the main Makefile
 ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
@@ -68,10 +66,8 @@ INCLUDEFILES += $(PYROOTDEP)
 include/%.h:    $(PYROOTDIRI)/%.h
 		cp $< $@
 
-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
 
-$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
@@ -112,7 +108,7 @@ clean::         clean-$(MODNAME)
 
 distclean-$(MODNAME): clean-$(MODNAME)
 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
-		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
+		   $(ROOTPY) $(PYROOTMAP) \
 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
 
 distclean::     distclean-$(MODNAME)
diff --git a/build/package/debian/rules b/build/package/debian/rules
index c999032..75b51c3 100644
--- a/build/package/debian/rules
+++ b/build/package/debian/rules
@@ -624,10 +624,6 @@ install-arch:
 		-X$(SYSCONFDIR)/root/system.rootauthrc			\
 		-X$(SYSCONFDIR)/root/system.rootdaemonrc		\
 		-X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a		\
-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc		\
-		-X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo		\
-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc			\
-		-X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo			
 #		$(foreach i, \
 #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
 #		    -X$(i:$(DTMP)/%=%) )
diff --git a/cint/cintex/Module.mk b/cint/cintex/Module.mk
index 556b37b..547b53a 100644
--- a/cint/cintex/Module.mk
+++ b/cint/cintex/Module.mk
@@ -31,10 +31,6 @@ else
 CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
 $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
 endif
-ifneq ($(BUILDPYTHON),no)
-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
-endif
 
 # used in the main Makefile
 ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
@@ -86,8 +82,6 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h
 		fi)
 		cp $< $@
 
-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
 
 $(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
diff --git a/cint/cintexcompat/Module.mk b/cint/cintexcompat/Module.mk
index 03423b7..e7f2a3a 100644
--- a/cint/cintexcompat/Module.mk
+++ b/cint/cintexcompat/Module.mk
@@ -31,10 +31,6 @@ else
 CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
 $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
 endif
-ifneq ($(BUILDPYTHON),no)
-CINTEXPYC    := $(CINTEXPY:.py=.pyc)
-CINTEXPYO    := $(CINTEXPY:.py=.pyo)
-endif
 
 # used in the main Makefile
 ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
@@ -86,12 +82,10 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h
 		fi)
 		cp $< $@
 
-%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
 
 ifeq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),)
 # Avoid conflict with cintex/Module.mk
-$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY)  \
                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"      \
 		"$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \
@@ -113,7 +107,7 @@ clean-check-$(MODNAME):
 clean::         clean-$(MODNAME)
 
 distclean-$(MODNAME): clean-$(MODNAME)
-		@rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO)
+		@rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY)
 		@rm -rf include/Cintex
 
 distclean::     distclean-$(MODNAME)
diff --git a/cint/reflex/Module.mk b/cint/reflex/Module.mk
index 71a4abc..27f3065 100644
--- a/cint/reflex/Module.mk
+++ b/cint/reflex/Module.mk
@@ -48,9 +48,6 @@ RFLX_GCCXMLPATHPY := $(RFLX_GRFLXDD)/gccxmlpath.py
 RFLX_GRFLXS   := $(wildcard $(RFLX_GRFLXSD)/*.py)
 RFLX_GRFLXPY  := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
 RFLX_GRFLXPY  += $(RFLX_GCCXMLPATHPY)
-ifneq ($(BUILDPYTHON),no)
-RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
-endif
 
 RFLX_LIBDIR = $(LIBDIR)
 
@@ -97,7 +94,7 @@ ALLEXECS += $(RFLX_GENMAPX)
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
                 clean-check-$(MODNAME) check-$(MODNAME) clean-genreflex
 
-POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
+POSTBIN += $(RFLX_GRFLXPY)
 
 include/Reflex/%.h: $(REFLEXDIRI)/Reflex/%.h
 		@(if [ ! -d "include/Reflex" ]; then          \
@@ -123,8 +120,6 @@ $(RFLX_GRFLXDD)/%.py: $(RFLX_GRFLXSD)/%.py $(RFLX_GCCXMLPATHPY)
 		  mkdir -p lib/python/genreflex; fi )
 		cp $< $@
 
-$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
-		@python -c 'import py_compile; py_compile.compile( "$<" )'
 
 $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
 
@@ -149,7 +144,7 @@ $(REFLEXDICTMAP): bin/rlibmap$(EXEEXT) $(MAKEFILEDEP) $(REFLEXL)
 		$(RLIBMAP) -o $(REFLEXDICTMAP) -l $(REFLEXDICTLIB) \
 		   -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
 
-all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
 
 clean-genreflex:
 		@rm -rf lib/python/genreflex
diff --git a/cint/reflex/python/CMakeLists.txt b/cint/reflex/python/CMakeLists.txt
index b1faf57..55062b8 100644
--- a/cint/reflex/python/CMakeLists.txt
+++ b/cint/reflex/python/CMakeLists.txt
@@ -15,7 +15,7 @@ ENDIF (NOT PYTHONINTERP_FOUND)
 #####################   sources   ####################
 
 FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
-SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
 
 #####################  gccxmlpath ####################

next             reply	other threads:[~2010-06-25 17:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-25 17:12 Justin Lecher (jlec) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-06-25 20:38 [gentoo-commits] gentoo-x86 commit in sci-physics/root/files: root-5.26.00-nobyte-compile.patch Sebastien Fabbro (bicatali)

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c352a18 dfblob:ca938d2 dfblob:1b5b602 dfblob:7028df2
dfblob:c999032 dfblob:75b51c3 dfblob:556b37b dfblob:547b53a
dfblob:03423b7 dfblob:e7f2a3a dfblob:71a4abc dfblob:27f3065
dfblob:b1faf57 dfblob:55062b8 )
 OR (
bs:"[gentoo-commits] gentoo-x86 commit in sci-physics/root/files: root-5.26.00-nobyte-compile.patch" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100625171237.2AD5D2CF63@corvid.gentoo.org \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox