[90600] trunk/dports/devel/levmar

[pixilla at macports.org]

Revision: 90600
          http://trac.macports.org/changeset/90600
Author:   pixilla at macports.org
Date:     2012-03-09 11:14:12 -0800 (Fri, 09 Mar 2012)
Log Message:
-----------
devel/levmar:
- Fix "port test". Maintainer patch.

Modified Paths:
--------------
    trunk/dports/devel/levmar/Portfile
    trunk/dports/devel/levmar/files/patch-Makefile.so.diff

Modified: trunk/dports/devel/levmar/Portfile
===================================================================
--- trunk/dports/devel/levmar/Portfile	2012-03-09 18:25:53 UTC (rev 90599)
+++ trunk/dports/devel/levmar/Portfile	2012-03-09 19:14:12 UTC (rev 90600)
@@ -5,6 +5,7 @@
 
 name                levmar
 version             2.6
+revision            1
 categories          devel
 platforms           darwin
 license             GPL
@@ -70,14 +71,15 @@
     file mkdir ${worksrcpath}/sobj
 }
 
-build.args-append   -f Makefile.so \
-                    CC="${configure.cc} [get_canonical_archflags cc]" \
-                    LDFLAGS=-Wl,-rpath,${prefix}/lib
+build.args-append   -f Makefile.so
+build.args-append   CC="${configure.cc} [get_canonical_archflags cc]"
+build.args-append   LDFLAGS+=-Wl,-rpath,${prefix}/lib
+# Add this local rpath to allow port test to run successfully
+build.args-append   LDFLAGS+=-Wl,-rpath,${worksrcpath}/sobj
 
 test.run            yes
-test.cmd            ./lmdemo
+test.cmd            ${worksrcpath}/lmdemo
 test.target         {}
-test.env            DYLD_LIBRARY_PATH=${worksrcpath}/sobj
 
 destroot {
     # library
@@ -85,6 +87,8 @@
 
     # test program
     xinstall -m 755 ${worksrcpath}/lmdemo ${destroot}${prefix}/bin/lmdemo
+    # Remove the local rpath which was present to allow port test to run successfully
+    system "install_name_tool -delete_rpath ${worksrcpath}/sobj ${destroot}${prefix}/bin/lmdemo"
 
     # header files
     xinstall -m 755 ${worksrcpath}/levmar.h ${destroot}${prefix}/include

Modified: trunk/dports/devel/levmar/files/patch-Makefile.so.diff
===================================================================
--- trunk/dports/devel/levmar/files/patch-Makefile.so.diff	2012-03-09 18:25:53 UTC (rev 90599)
+++ trunk/dports/devel/levmar/files/patch-Makefile.so.diff	2012-03-09 19:14:12 UTC (rev 90600)
@@ -10,7 +10,7 @@
  CC=gcc
  CONFIGFLAGS=-ULINSOLVERS_RETAIN_MEMORY
  #ARCHFLAGS=-march=pentium4 # YOU MIGHT WANT TO UNCOMMENT THIS FOR P4
-@@ -14,14 +15,23 @@
+@@ -14,14 +15,24 @@
  LAPACKLIBS_PATH=/usr/local/lib # WHEN USING LAPACK, CHANGE THIS TO WHERE YOUR COMPILED LIBS ARE!
  LIBOBJS=$(ODIR)/lm.o $(ODIR)/Axb.o $(ODIR)/misc.o $(ODIR)/lmlec.o $(ODIR)/lmbc.o $(ODIR)/lmblec.o $(ODIR)/lmbleic.o
  LIBSRCS=lm.c Axb.c misc.c lmlec.c lmbc.c lmblec.c lmbleic.c
@@ -34,6 +34,7 @@
 +
 +$(ODIR)/liblevmar.dylib: $(ODIR)/liblevmar.$(MAJ).$(MIN).dylib
 +	ln -s liblevmar.$(MAJ).$(MIN).dylib $(ODIR)/liblevmar.dylib
++	ln -s liblevmar.$(MAJ).$(MIN).dylib $(ODIR)/liblevmar.$(MAJ).dylib
  
  # implicit rule for generating *.o files in ODIR from *.c files
  $(ODIR)/%.o : %.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120309/fa9f9ae5/attachment.html>