[med-svn] [Git][med-team/libssw][master] 2 commits: Revert some unintended change of the sequence of options to reduce the diff to some working version

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libssw


Commits:
9068a245 by Andreas Tille at 2020-08-12T13:24:11+02:00
Revert some unintended change of the sequence of options to reduce the diff to some working version

- - - - -
82783228 by Andreas Tille at 2020-08-12T13:46:30+02:00
No parallel build

- - - - -


4 changed files:

- debian/changelog
- debian/patches/hardening.patch
- debian/patches/rename_tool.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libssw (1.1-11) UNRELEASED; urgency=medium
+
+  * No parallel build (otherwise some architectures fail to create
+    static lib right in time)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 12 Aug 2020 13:44:12 +0200
+
 libssw (1.1-10) unstable; urgency=medium
 
   * Team upload


=====================================
debian/patches/hardening.patch
=====================================
@@ -29,7 +29,7 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  
  $(PROG) $(EXAMPLE): $(LOBJS)
 -	$(CC) -o $@ $(filter-out %.h,$^) $(CFLAGS) -lm -lz
-+	$(CC) -o $@ $(filter-out %.h,$^) $(CFLAGS) $(CPPFLAGS) -lm -lz $(LDFLAGS)
++	$(CC) -o $@ $(filter-out %.h,$^) $(CPPFLAGS) $(CFLAGS) -lm -lz $(LDFLAGS)
  
  $(EXAMPLE_CPP): example.cpp $(LOBJS) $(LCPPOBJS)
 -	$(CXX) -o $@ $^ $(CXXFLAGS) -lm -lz


=====================================
debian/patches/rename_tool.patch
=====================================
@@ -25,7 +25,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  
 -$(PROG) $(EXAMPLE): $(LOBJS)
 +$(EXAMPLE): $(LOBJS)
- 	$(CC) -o $@ $(filter-out %.h,$^) $(CFLAGS) $(CPPFLAGS) -lm -lz $(LDFLAGS)
+ 	$(CC) -o $@ $(filter-out %.h,$^) $(CPPFLAGS) $(CFLAGS) -lm -lz $(LDFLAGS)
  
  $(EXAMPLE_CPP): example.cpp $(LOBJS) $(LCPPOBJS)
 --- a/src/main.c


=====================================
debian/rules
=====================================
@@ -26,9 +26,9 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 ifneq ($(filter nojava,$(DEB_BUILD_PROFILES)),)
-	dh_auto_build --sourcedirectory src -- default
+	dh_auto_build --no-parallel --sourcedirectory src -- default
 else
-	dh_auto_build --sourcedirectory src -- default java
+	dh_auto_build --no-parallel --sourcedirectory src -- default java
 endif
 
 ifneq ($(filter nojava,$(DEB_BUILD_PROFILES)),)



View it on GitLab: https://salsa.debian.org/med-team/libssw/-/compare/c2c568647338036513f688cdd8171d551134a7ad...82783228dd06349293b9f6fd996a26f0a11775a9

-- 
View it on GitLab: https://salsa.debian.org/med-team/libssw/-/compare/c2c568647338036513f688cdd8171d551134a7ad...82783228dd06349293b9f6fd996a26f0a11775a9
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/20200812/9bc5a831/attachment-0001.html>