Andreas Tille pushed to branch master at Debian Med / librcsb-core-wrapper
Commits:
51219fdb by Andreas Tille at 2026-09-10T21:49:05+02:00
More fixes to upstream watch files
- - - - -
2 changed files:
- debian/patches/fix-makefile.patch
- debian/patches/series
Changes:
=====================================
debian/patches/fix-makefile.patch
=====================================
@@ -4,7 +4,15 @@ Description: Salsa CI fails due to missing dir - just create it
--- a/common/Makefile
+++ b/common/Makefile
-@@ -144,7 +144,9 @@ clean_build:
+@@ -104,6 +104,7 @@ clean: clean_build
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+@@ -144,7 +145,9 @@ clean_build:
$(L_MOD_LIB): $(OBJ_FILES)
# Create module library
@@ -40,3 +48,84 @@ Description: Salsa CI fails due to missing dir - just create
it
+ @mkdir -p $(OBJ_DIR)
$(CCC) $(CPPFLAGS) $(C++FLAGS) $(EXT_COMP_OPT) -c $< -o $(OBJ_DIR)/$@
+--- a/Makefile
++++ b/Makefile
+@@ -105,7 +105,7 @@ lib/librcsb-core-wrapper.la:
+ export WWPDB_XERCESC_INC=/usr/include; \
+ export WWPDB_XERCESC_LIB_DIR=/usr/lib; \
+ export WWPDB_XERCESC_LIB=xerces-c; \
+- ( cd ./$(UTIL_MODULE); ./$(COMPILE_SCRIPT) ); \
++ ( cd ./$(UTIL_MODULE); ./$(COMPILE_SCRIPT) ) && \
+ libtool --mode=link $(CXX) -version-info 0:1:0 -rpath /usr/lib
$(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -l$${WWPDB_XERCESC_LIB} -o
lib/librcsb-core-wrapper.la lib/*.lo'
+
+ debug:
+--- a/cif-file-util/Makefile
++++ b/cif-file-util/Makefile
+@@ -96,6 +96,7 @@ clean: clean_build
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+--- a/cif-file/Makefile
++++ b/cif-file/Makefile
+@@ -96,6 +96,7 @@ clean: clean_build
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+--- a/cif-parser/Makefile
++++ b/cif-parser/Makefile
+@@ -121,6 +121,7 @@ clean: clean_build
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+--- a/dict-obj-file/Makefile
++++ b/dict-obj-file/Makefile
+@@ -167,6 +167,7 @@ clean_test:
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+--- a/pdbml-parser/Makefile
++++ b/pdbml-parser/Makefile
+@@ -182,6 +182,7 @@ clean_test:
+ # Rule for making module library in master library directory
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+--- a/regex/Makefile
++++ b/regex/Makefile
+@@ -105,6 +105,7 @@ clean: clean_build clean_test
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
+--- a/tables/Makefile
++++ b/tables/Makefile
+@@ -93,6 +93,7 @@ clean: clean_build
+
+ $(M_MOD_LIB): $(L_MOD_LIB)
+ # Install header files
++ @mkdir -p $(M_INCL_DIR)
+ @cd $(L_INCL_DIR); \
+ ../$(INSTALL) $(INSTALLOPTS) $(HEADER_FILES) ../$(M_INCL_DIR)
+
=====================================
debian/patches/series
=====================================
@@ -21,4 +21,3 @@ INSTALL-is-cifinstall.patch
make-4.4.1.patch
make-shuffle-reverse.patch
fix-makefile.patch
-# make-wrapper.patch
View it on GitLab:
https://salsa.debian.org/med-team/librcsb-core-wrapper/-/commit/51219fdb2f4e903a24673be458487fb3516535b8
--
View it on GitLab:
https://salsa.debian.org/med-team/librcsb-core-wrapper/-/commit/51219fdb2f4e903a24673be458487fb3516535b8
You're receiving this email because of your account on salsa.debian.org. Manage
all notifications: https://salsa.debian.org/-/profile/notifications | Help:
https://salsa.debian.org/help
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
