[77088] trunk/dports/lang/lua

[ryandesign at macports.org]

Revision: 77088
          http://trac.macports.org/changeset/77088
Author:   ryandesign at macports.org
Date:     2011-03-19 21:27:39 -0700 (Sat, 19 Mar 2011)
Log Message:
-----------
lua: fix universal and non-default build_arch for dynamic library; see #18402

Modified Paths:
--------------
    trunk/dports/lang/lua/Portfile
    trunk/dports/lang/lua/files/patch-dlopen.diff

Modified: trunk/dports/lang/lua/Portfile
===================================================================
--- trunk/dports/lang/lua/Portfile	2011-03-20 04:09:26 UTC (rev 77087)
+++ trunk/dports/lang/lua/Portfile	2011-03-20 04:27:39 UTC (rev 77088)
@@ -26,7 +26,7 @@
 test.env            DYLD_LIBRARY_PATH=./lib
 
 patchfiles          patch-dlopen.diff
-patch.args          -p1
+
 post-patch {
     reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile ${worksrcpath}/src/luaconf.h
     reinplace "s|/man/man1|/share/man/man1|g" ${worksrcpath}/Makefile

Modified: trunk/dports/lang/lua/files/patch-dlopen.diff
===================================================================
--- trunk/dports/lang/lua/files/patch-dlopen.diff	2011-03-20 04:09:26 UTC (rev 77087)
+++ trunk/dports/lang/lua/files/patch-dlopen.diff	2011-03-20 04:27:39 UTC (rev 77088)
@@ -1,6 +1,5 @@
-diff -x .svn -ru work/lua-5.1.4/Makefile lua-5.1.4/Makefile
---- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
-+++ lua-5.1.4/Makefile	2010-11-18 22:30:01.000000000 +0100
+--- Makefile.orig	2008-08-11 19:40:48.000000000 -0500
++++ Makefile	2011-03-19 23:15:33.000000000 -0500
 @@ -43,7 +43,7 @@
  # What to install.
  TO_BIN= lua luac
@@ -19,9 +18,8 @@
  
  ranlib:
  	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
-diff -x .svn -ru work/lua-5.1.4/src/Makefile lua-5.1.4/src/Makefile
---- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
-+++ lua-5.1.4/src/Makefile	2010-11-18 22:31:34.000000000 +0100
+--- src/Makefile.orig	2008-01-19 13:37:58.000000000 -0600
++++ src/Makefile	2011-03-19 23:17:58.000000000 -0500
 @@ -22,7 +22,7 @@
  
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
@@ -31,21 +29,20 @@
  CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
  	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  	lundump.o lvm.o lzio.o
-@@ -50,9 +50,12 @@
+@@ -50,9 +50,11 @@
  $(LUA_A): $(CORE_O) $(LIB_O)
  	$(AR) $@ $?
  	$(RANLIB) $@
-+	$(CC) -dynamiclib -install_name %PREFIX%/lib/liblua.%COMPAT_VERSION%.dylib \
-+		-compatibility_version %COMPAT_VERSION% -current_version %VERSION% \
-+		-o liblua.%VERSION%.dylib $^
++	$(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name %PREFIX%/lib/liblua.%COMPAT_VERSION%.dylib \
++		-compatibility_version %COMPAT_VERSION% -current_version %VERSION% $^
  
  $(LUA_T): $(LUA_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+	$(CC) -fno-common -DLUA_USE_LINUX -lreadline -L. -llua.%VERSION% lua.c -o lua
++	$(CC) -o $@ -L. $(MYLDFLAGS) $(MYCFLAGS) $(MYLIBS) -llua.%VERSION% lua.c
  
  $(LUAC_T): $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-@@ -99,7 +102,7 @@
+@@ -99,7 +101,7 @@
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
  
  macosx:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110319/1d5fc411/attachment-0001.html>