[med-svn] [Git][med-team/tigr-glimmer][master] 3 commits: working on closing #960294 for real

Étienne Mollier gitlab at salsa.debian.org
Wed May 13 21:52:11 BST 2020 


Étienne Mollier pushed to branch master at Debian Med / tigr-glimmer


Commits:
1e8776dd by Etienne Mollier at 2020-05-13T22:20:27+02:00
working on closing #960294 for real

- - - - -
baaf2276 by Etienne Mollier at 2020-05-13T22:40:31+02:00
src/c_make.gen: more verbosity, more error checks

- - - - -
b1314172 by Etienne Mollier at 2020-05-13T22:41:56+02:00
make-errs.patch: fixed typo

- - - - -


2 changed files:

- debian/changelog
- debian/patches/make-errs.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+tigr-glimmer (3.02b-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Reinforce Makefile error checking and increase verbosity; initial version
+    for 3.02b-4 missed at least one point at linking time.  Closes: #960294
+
+ -- Etienne Mollier <etienne.mollier at mailoo.org>  Wed, 13 May 2020 22:19:56 +0200
+
 tigr-glimmer (3.02b-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/make-errs.patch
=====================================
@@ -1,8 +1,17 @@
-Description: reinforce Makefile error checking
+Description: reinforce Makefile error checking and increase verbosity
+ Initial version of the patch only reinforced Makefile error checking, but some
+ simili try/catch statement seem to be interfering with proper error
+ detection.
+ .
+ This version increases the verbosity of the build procedure by removing the @
+ commands, excepts for the beautifying `echo` statements.  In addition, error
+ checking if further reinforced, and the error handling logic of the "if"
+ statement has been modified to trigger an exit with the error status of the
+ linking command.
 Author: Étienne Mollier <etienne.mollier at mailoo.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=960294
 Forwarded: no
-Last-Update: 2020-05-11
+Last-Update: 2020-05-13
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- tigr-glimmer.orig/src/c_make.gen
@@ -12,7 +21,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  $(C_OBJECTS): %.o: %.c
  	@ echo "@@@@@@@@@@@@@@@@@@@ " $< "@@@@@@@@@@@@@@@@@@@@@";
 -	@ if [ -e $(notdir $<) ] ; then \
-+	@ set -e ; \
++	set -e ; \
 +	if [ -e $(notdir $<) ] ; then \
  	  $(CC) $(CPPFLAGS) $(CDEFS) $(CFLAGS) -c \
  		$(INC_DIRS) -o $(LOCAL_OBJ)/$*.o $< ; \
@@ -22,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  $(CXX_OBJECTS_CC): %.o: %.cc
  	@ echo "@@@@@@@@@@@@@@@@@@@ " $< "@@@@@@@@@@@@@@@@@@@@@";
 -	@ if [ -e $(notdir $<) ] ; then \
-+	@ set -e ; \
++	set -e ; \
 +	if [ -e $(notdir $<) ] ; then \
  	  $(CXX) $(CPPFLAGS) $(CXXDEFS) $(CXXFLAGS) -c \
  		$(INC_DIRS) -o $(LOCAL_OBJ)/$*.o $< ; \
@@ -32,22 +41,83 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  $(CXX_OBJECTS_C): %.o: %.C
  	@ echo "@@@@@@@@@@@@@@@@@@@ " $< "@@@@@@@@@@@@@@@@@@@@@";
 -	@ if [ -e $(notdir $<) ] ; then \
-+	@ set -e ; \
++	set -e ; \
 +	if [ -e $(notdir $<) ] ; then \
  	  $(CXX) $(CPPFLAGS) $(CXXDEFS) $(CXXFLAGS) -c \
  		$(INC_DIRS) -o $(LOCAL_OBJ)/$*.o $< ; \
  	else \
-@@ -355,7 +358,8 @@
+@@ -350,46 +353,56 @@
+ 
+ $(LIBRARIES):
+ 	@ echo "################### " $@ "#####################";
+-	@ cd $(LOCAL_OBJ); \
++	cd $(LOCAL_OBJ) && \
+ 	  $(AR) $(ARFLAGS) $(LOCAL_LIB)/$(notdir $@) $+ 
  
  $(PROGS):
  	@ echo "++++++++++++++++++++ " $@ "++++++++++++++++++++++";
 -	@ if [ -z "$(filter $(CXX_OBJECTS), $(notdir $+))" ] ; then \
-+	@ set -e ; \
++	set -e ; \
++	STATUS=0 ; \
 +	if [ -z "$(filter $(CXX_OBJECTS), $(notdir $+))" ] ; then \
  	  cd $(LOCAL_OBJ); \
- 	    if $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
-                $(LD_DIRS) $(filter-out lib%.a, $+) \
-@@ -415,6 +419,7 @@
+-	    if $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
+-               $(LD_DIRS) $(filter-out lib%.a, $+) \
+-	       $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) ; then \
+-			true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \
++	    $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
++	    $(LD_DIRS) $(filter-out lib%.a, $+) \
++	    $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) \
++	    || STATUS=$${?} ; \
++	    if [ $${STATUS} != 0 ] ; then \
++	      rm -f $(LOCAL_BIN)/$(notdir $@); \
++	      exit $${STATUS}; \
++	    fi; \
+ 	else \
+ 	  cd $(LOCAL_OBJ); \
+-	    if $(CXX) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
+-               $(LD_DIRS) $(filter-out lib%.a, $+) \
+-	       $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) ; then \
+-			true; else rm -f $(LOCAL_BIN)/$(notdir $@); fi; \
++	    $(CXX) -o $(LOCAL_BIN)/$(notdir $@) $(LDFLAGS) \
++	    $(LD_DIRS) $(filter-out lib%.a, $+) \
++	    $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) \
++	    || STATUS=$${?} ; \
++	    if [ $${STATUS} != 0 ] ; then \
++	      rm -f $(LOCAL_BIN)/$(notdir $@); \
++	      exit $${STATUS}; \
++	    fi; \
+ 	fi ;
+ 
+ #### For making dependencies
+ $(C_DEPS): %.d: %.c
+-	@ if [ -e $(notdir $<) ] ; then \
++	if [ -e $(notdir $<) ] ; then \
+ 	  $(SHELL) -ec '$(CC) -M $(CPPFLAGS) $(INC_DIRS) $< \
+ 	    | sed '\''s/$*\\.o[ :]*/& $@/g'\'' > $@' ; \
+         fi ;
+ 
+ $(CXX_DEPS_CC): %.d: %.cc
+-	@ if [ -e $(notdir $<) ] ; then \
++	if [ -e $(notdir $<) ] ; then \
+ 	  $(SHELL) -ec '$(CXX) -M $(CPPFLAGS) $(INC_DIRS) $< \
+ 	    | sed '\''s/$*\\.o[ :]*/& $@/g'\'' > $@' ; \
+         fi ;
+ 
+ $(CXX_DEPS_C): %.d: %.C
+-	@ if [ -e $(notdir $<) ] ; then \
++	if [ -e $(notdir $<) ] ; then \
+ 	  $(SHELL) -ec '$(CXX) -M $(CPPFLAGS) $(INC_DIRS) $< \
+ 	    | sed '\''s/$*\\.o[ :]*/& $@/g'\'' > $@' ; \
+         fi ;
+ 
+ $(CXX_DEPS_CPP): %.d: %.cpp
+-	@ if [ -e $(notdir $<) ] ; then \
++	if [ -e $(notdir $<) ] ; then \
+ 	  $(SHELL) -ec '$(CC) -M $(CPPFLAGS) $(INC_DIRS) $< \
+ 	    | sed '\''s/$*\\.o[ :]*/& $@/g'\'' > $@' ; \
+         fi ;
+@@ -415,6 +428,7 @@
  # The following recurses the subdirectories that exist
  define dosubdirs
  echo "* Make Target is " $(TGT);
@@ -55,3 +125,43 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  for i in $(SUBDIRS);\
    do \
      if [ -d $$i ]; then \
+--- tigr-glimmer.orig/src/Makefile
++++ tigr-glimmer/src/Makefile
+@@ -2,27 +2,27 @@
+ 
+ 
+ all:
+-	@ TGT=objs
+-	@ $(dosubdirs)
+-	@ TGT=libs
+-	@ $(dosubdirs)
+-	@ TGT=progs
+-	@ $(dosubdirs)
++	TGT=objs
++	$(dosubdirs)
++	TGT=libs
++	$(dosubdirs)
++	TGT=progs
++	$(dosubdirs)
+ 
+ 
+ install: all
+-	@ $(dosubdirs)
++	$(dosubdirs)
+ 
+ clean:
+-	@ $(dosubdirs)
++	$(dosubdirs)
+ 
+ 
+ tester: 
+-	@ $(dosubdirs)
++	$(dosubdirs)
+ 
+ 
+ regression: 
+-	@ $(dosubdirs)
++	$(dosubdirs)
+ 
+ LOCAL_WORK = $(shell cd ..; pwd)
+ # Include for AS project rules



View it on GitLab: https://salsa.debian.org/med-team/tigr-glimmer/-/compare/b6247894969518a53588c78ec6bfed21630fc392...b131417254d295ae43aec8d96d29cfc674d5a0cc

-- 
View it on GitLab: https://salsa.debian.org/med-team/tigr-glimmer/-/compare/b6247894969518a53588c78ec6bfed21630fc392...b131417254d295ae43aec8d96d29cfc674d5a0cc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200513/4cf41d35/attachment-0001.html>

More information about the debian-med-commit mailing list