[134117] trunk/dports/science/lparse

larryv at macports.org larryv at macports.org
Wed Mar 18 13:58:55 PDT 2015


Revision: 134117
          https://trac.macports.org/changeset/134117
Author:   larryv at macports.org
Date:     2015-03-18 13:58:55 -0700 (Wed, 18 Mar 2015)
Log Message:
-----------
lparse: Fix never-failing makefile recipes (#47196)

Several recipes contain "`make ; cd ..`", so they ignore the exit status
of `make` and always "succeed". Grading on a curve.

Modified Paths:
--------------
    trunk/dports/science/lparse/Portfile

Added Paths:
-----------
    trunk/dports/science/lparse/files/fix-recursive-make.patch

Modified: trunk/dports/science/lparse/Portfile
===================================================================
--- trunk/dports/science/lparse/Portfile	2015-03-18 19:48:38 UTC (rev 134116)
+++ trunk/dports/science/lparse/Portfile	2015-03-18 20:58:55 UTC (rev 134117)
@@ -28,7 +28,8 @@
 checksums           rmd160  131f6ea6235eeb7529d2564bb9ce904e5bc2358a \
                     sha256  886d29723f7188296e48584a4a32b8f111414acb7ca8490af28ef6b7f1717298
 
-patchfiles          patch-configure.diff
+patchfiles          patch-configure.diff \
+                    fix-recursive-make.patch
 
 # this configure argument is only used for installing
 configure.pre_args  --prefix=${destroot}${prefix}/bin

Added: trunk/dports/science/lparse/files/fix-recursive-make.patch
===================================================================
--- trunk/dports/science/lparse/files/fix-recursive-make.patch	                        (rev 0)
+++ trunk/dports/science/lparse/files/fix-recursive-make.patch	2015-03-18 20:58:55 UTC (rev 134117)
@@ -0,0 +1,28 @@
+The suffixed "; cd" pipeline causes each recipe to completely ignore the
+exit status of its recursive make invocation, which is bad.
+
+(There's really no need to explicitly change back to the parent
+directory anyway, since make executes recipes in subshells).
+
+Index: Makefile.base
+===================================================================
+--- Makefile.base.orig
++++ Makefile.base
+@@ -1,13 +1,13 @@
+ 
+ lparse :
+-	cd src ; make ; cd ..
++	cd src && $(MAKE)
+ 
+ check :
+-	cd test; make; cd ..
++	cd test && $(MAKE)
+ 
+ clean :
+-	cd src; make clean; cd ..
+-	cd test; make clean; cd ..
++	cd src && $(MAKE) clean
++	cd test && $(MAKE) clean
+ 
+ install : lparse
+ 	cp src/lparse $(INSTALLATION_PATH)/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150318/f7a094ee/attachment.html>


More information about the macports-changes mailing list