[med-svn] r12086 - in trunk/packages/rcsb-core-wrapper/trunk/debian: . patches

Laszlo Kajan lkajan-guest at alioth.debian.org
Fri Aug 17 19:21:38 UTC 2012 

Author: lkajan-guest
Date: 2012-08-17 19:21:38 +0000 (Fri, 17 Aug 2012)
New Revision: 12086

Modified:
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
   trunk/packages/rcsb-core-wrapper/trunk/debian/python-corepywrap.README.Debian
Log:
fixed parallel build issue

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening	2012-08-17 16:49:45 UTC (rev 12085)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening	2012-08-17 19:21:38 UTC (rev 12086)
@@ -21,20 +21,24 @@
  
 --- a/cif-parser/Makefile
 +++ b/cif-parser/Makefile
-@@ -181,14 +181,14 @@
- 	@sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
+@@ -181,17 +181,17 @@
+ 	sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
  	mv $(^:.y=.tab.c) $(^:.y=.c)
  	mv $(^:.y=.tab.h) $(^:.y=.h)
--	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
-+	libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
+-	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o obj/$(*)Parser.o
++	libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o obj/$(*)Parser.o
  
- obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
+ obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o $(SRC_DIR)/%Parser.h
  	$(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@F:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
 -	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
 +	libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
  
  
  # Rule for making other object files
+ obj/%ScannerBase.o: $(SRC_DIR)/%ScannerBase.C $(SRC_DIR)/%Parser.h
+-	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
++	libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
+ 
  obj/%.o: $(SRC_DIR)/%.C
 -	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
 +	libtool --mode=compile $(CCC) $(CPPFLAGS) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles	2012-08-17 16:49:45 UTC (rev 12085)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles	2012-08-17 19:21:38 UTC (rev 12086)
@@ -38,7 +38,7 @@
 --- a/cif-parser/Makefile
 +++ b/cif-parser/Makefile
 @@ -170,6 +170,8 @@
- $(L_MOD_LIB): $(addprefix obj/,$(OBJ_FILES))
+ $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
 +	cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
@@ -53,16 +53,16 @@
 -	$(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@ 
 +	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
  
- obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
- 	$(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@F:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
--	$(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
-+	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
+ %Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
+ 	$(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
+-	$(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$@
++	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$@
  
  
  # Rule for making other object files
- obj/%.o: $(SRC_DIR)/%.C
--	$(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
-+	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
+ %.o: $(SRC_DIR)/%.C
+-	$(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
  
 --- a/common/Makefile
 +++ b/common/Makefile
@@ -83,7 +83,7 @@
  
 --- a/dict-obj-file/Makefile
 +++ b/dict-obj-file/Makefile
-@@ -195,6 +195,8 @@
+@@ -193,6 +193,8 @@
  $(L_MOD_LIB): $(OBJ_OTHER_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_OTHER_FILES)
@@ -92,7 +92,7 @@
  	$(RANLIB) $@
  	@echo $@ " is up to date."
  
-@@ -206,5 +208,5 @@
+@@ -204,5 +206,5 @@
  
  # Phony rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -170,7 +170,18 @@
  UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util
  UTIL_MODULE = util
  CHECKOUT_SCRIPT = checkout.sh
-@@ -82,11 +81,23 @@
+@@ -12,9 +11,7 @@
+ CLEAN_DOC_SCRIPT = clean_doc.sh
+ EXPORT_SCRIPT = export.sh
+ 
+-all: 
+-	@echo
+-	@echo ------- compile targets are compile_lnx_38, compile_lnx_41, and compile_osx -------
++all: lib/librcsb-core-wrapper.la
+ 
+ compile:  
+ 	@echo
+@@ -82,11 +79,23 @@
          export WWPDB_XERCESC_LIB=xerces-c; \
          ./$(COMPILE_SCRIPT)'
  

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build	2012-08-17 16:49:45 UTC (rev 12085)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build	2012-08-17 19:21:38 UTC (rev 12086)
@@ -11,31 +11,36 @@
 +$(L_MOD_LIB): $(addprefix obj/,$(OBJ_FILES))
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
- 	$(RANLIB) $@
-@@ -175,18 +175,18 @@
+ 	cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
+@@ -177,18 +177,21 @@
  
  
  # Specific rules for making object files
 -$(OBJ_DIR)/%Parser.o: $(SRC_DIR)/%Parser.y
-+obj/%Parser.o: $(SRC_DIR)/%Parser.y
- 	@sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
+-	@sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
++obj/%Parser.o $(SRC_DIR)/%Parser.h: $(SRC_DIR)/%Parser.y
++	sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
  	mv $(^:.y=.tab.c) $(^:.y=.c)
  	mv $(^:.y=.tab.h) $(^:.y=.h)
- 	$(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@ 
+-	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
++	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o obj/$(*)Parser.o
  
 -%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
 -	$(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
--	$(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$@
-+obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
+-	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$@
++obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o $(SRC_DIR)/%Parser.h
 +	$(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@F:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
-+	$(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
++	libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
  
  
  # Rule for making other object files
 -%.o: $(SRC_DIR)/%.C
--	$(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+-	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++obj/%ScannerBase.o: $(SRC_DIR)/%ScannerBase.C $(SRC_DIR)/%Parser.h
++	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
++
 +obj/%.o: $(SRC_DIR)/%.C
-+	$(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
++	libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
  
 --- a/dict-obj-file/Makefile
 +++ b/dict-obj-file/Makefile

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2012-08-17 16:49:45 UTC (rev 12085)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2012-08-17 19:21:38 UTC (rev 12086)
@@ -3,9 +3,9 @@
 bash
 make_pair
 unistd
-parallel-build
 docs
 objectfiles
+parallel-build
 setup.py.in
 hardening
 spelling

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in	2012-08-17 16:49:45 UTC (rev 12085)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in	2012-08-17 19:21:38 UTC (rev 12086)
@@ -83,13 +83,11 @@
  $(L_MOD_LIB): $(OBJ_FILES) $(ALL_DEP_LIBS)
 --- a/Makefile
 +++ b/Makefile
-@@ -11,9 +11,11 @@
+@@ -11,7 +11,11 @@
  CLEAN_DOC_SCRIPT = clean_doc.sh
  EXPORT_SCRIPT = export.sh
  
--all: 
--	@echo
--	@echo ------- compile targets are compile_lnx_38, compile_lnx_41, and compile_osx -------
+-all: lib/librcsb-core-wrapper.la
 +all: wrapper
 +
 +.PHONY: wrapper

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/python-corepywrap.README.Debian
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/python-corepywrap.README.Debian	2012-08-17 16:49:45 UTC (rev 12085)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/python-corepywrap.README.Debian	2012-08-17 19:21:38 UTC (rev 12086)
@@ -8,5 +8,5 @@
  1: mkdir -p /tmp/test && pushd /tmp/test && mkdir -p ../data
  2: wget -O ../data/2j01.cif.gz http://www.rcsb.org/pdb/files/2J01.cif.gz
  3: gunzip ../data/2j01.cif.gz
- 4: python /usr/share/doc/python-librcsb-core-wrapper/examples/CorePyWrapTests.py
+ 4: python /usr/share/doc/python-corepywrap/examples/CorePyWrapTests.py
  5: popd

More information about the debian-med-commit mailing list