Patch to make textproc/luaexpat build on amd64 (Thankyou Kelly Hayes!) Fix: Patch attached. Patch attached with submission follows: How-To-Repeat: textproc/luaexpat and net-im/prosody are marked ONLY_FOR_ARCHS=i386 and we are aiming to correct this
Responsible Changed From-To: freebsd-ports-bugs->amdmi3 I'll take it.
> Synopsis: Update port: textproc/luaexpat to build on amd64 > > http://www.freebsd.org/cgi/query-pr.cgi?pr=136786 What about some additions: o Respect CC o Check for actual lua version correctly (I think this was intended) --- luaexpat.patch begins here --- Index: Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/textproc/luaexpat/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 14 Jul 2009 06:36:52 -0000 1.2 +++ Makefile 15 Jul 2009 19:00:56 -0000 @@ -16,17 +16,18 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -ONLY_FOR_ARCHS= i386 - MAKEFILE= makefile ALL_TARGET= lib USE_LUA= 5.0-5.1 +LUA_PREMK= yes WANT_LUA_VER= 5.1 CFLAGS+= -fPIC -.if ${USE_LUA} == 5.0 +.include <bsd.port.pre.mk> + +.if ${LUA_VER} == 5.0 BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/lua50-compat51:build .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: files/patch-config =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/textproc/luaexpat/files/patch-config,v retrieving revision 1.1 diff -u -r1.1 patch-config --- files/patch-config 14 Jul 2009 06:02:55 -0000 1.1 +++ files/patch-config 15 Jul 2009 18:46:59 -0000 @@ -1,5 +1,5 @@ ---- config.orig 2006-06-08 20:41:48.000000000 +0000 -+++ config 2009-07-03 03:00:20.000000000 +0000 +--- config.orig 2006-06-09 00:41:48.000000000 +0400 ++++ config 2009-07-15 22:46:59.000000000 +0400 @@ -1,15 +1,15 @@ # Installation directories # System's libraries directory (where binary libraries are installed) @@ -30,3 +30,12 @@ # Compilation parameters CWARNS = -Wall -pedantic \ +@@ -31,6 +31,6 @@ + -Wshadow \ + -Wwrite-strings + +-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ ++CFLAGS += $(CWARNS) -ansi -O2 -I$(LUA_INC) \ + -I$(COMPAT_DIR) -I$(EXPAT_INC) +-CC = gcc ++CC? = gcc --- luaexpat.patch ends here --- -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
State Changed From-To: open->feedback Awaiting submitters feedback
> o Respect CC I had submitted a patch for this but I miscategorised it: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/136789 >o Check for actual lua version correctly (I think this was intended) Indeed. Looks good, thankyou very much. :)
State Changed From-To: feedback->open Submitter has approved.
State Changed From-To: open->closed Committed. Thanks!
amdmi3 2009-07-15 22:54:33 UTC FreeBSD ports repository Modified files: textproc/luaexpat Makefile textproc/luaexpat/files patch-config Log: - Fix on amd64 - Respect CC - Check for lua version correctly PR: 136786, 136789 Submitted by: Andrew Lewis <freeghb@gmail.com> (maintainer) Revision Changes Path 1.3 +5 -4 ports/textproc/luaexpat/Makefile 1.2 +11 -2 ports/textproc/luaexpat/files/patch-config _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"