[134066] trunk/dports/sysutils/getopt
devans at macports.org
devans at macports.org
Tue Mar 17 15:24:58 PDT 2015
Revision: 134066
https://trac.macports.org/changeset/134066
Author: devans at macports.org
Date: 2015-03-17 15:24:57 -0700 (Tue, 17 Mar 2015)
Log Message:
-----------
getopt: build fix for non x86_64 archs, version 1.1.6 no longer ships with extraneous *.o files (#47173).
Modified Paths:
--------------
trunk/dports/sysutils/getopt/Portfile
trunk/dports/sysutils/getopt/files/patch-Makefile.diff
Modified: trunk/dports/sysutils/getopt/Portfile
===================================================================
--- trunk/dports/sysutils/getopt/Portfile 2015-03-17 21:56:40 UTC (rev 134065)
+++ trunk/dports/sysutils/getopt/Portfile 2015-03-17 22:24:57 UTC (rev 134066)
@@ -31,26 +31,17 @@
checksums rmd160 6ef3666d386450fa5ce249e7748805df5c8482c9 \
sha256 d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe
-post-extract {
- # 1.1.5 ships with ELF .o files
- fs-traverse f ${worksrcpath} {
- if {[file isfile ${f}] && [file extension ${f}] eq ".o"} {
- delete ${f}
- }
- }
-}
-
patchfiles patch-Makefile.diff
-use_configure no
-
-variant universal {}
-
post-patch {
reinplace -E "/^CFLAGS/s|\$| [get_canonical_archflags cc]|" ${worksrcpath}/Makefile
reinplace -E "/^LDFLAGS/s|\$| [get_canonical_archflags ld]|" ${worksrcpath}/Makefile
}
+use_configure no
+
+variant universal {}
+
build.args CC=${configure.cc} \
LIBCGETOPT=0 \
mandir=${prefix}/share/man \
Modified: trunk/dports/sysutils/getopt/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/getopt/files/patch-Makefile.diff 2015-03-17 21:56:40 UTC (rev 134065)
+++ trunk/dports/sysutils/getopt/files/patch-Makefile.diff 2015-03-17 22:24:57 UTC (rev 134066)
@@ -1,5 +1,5 @@
---- Makefile.orig 2014-11-24 04:33:39.000000000 -0800
-+++ Makefile 2015-03-16 22:15:21.000000000 -0700
+--- Makefile.orig 2015-03-17 15:14:56.000000000 -0700
++++ Makefile 2015-03-17 15:15:01.000000000 -0700
@@ -32,7 +32,7 @@
LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
@@ -9,14 +9,12 @@
ifeq ($(LIBCGETOPT),0)
CPPFLAGS+=-I./gnu
endif
-@@ -42,8 +42,8 @@
- -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+@@ -43,7 +43,7 @@
-Wnested-externs -Winline
OPTIMIZE=-O3 -fno-strength-reduce
--CFLAGS=$(WARNINGS) $(OPTIMIZE)
+ CFLAGS=$(WARNINGS) $(OPTIMIZE)
-LDFLAGS=
-+CFLAGS=$(WARNINGS) $(OPTIMIZE) -arch x86_64
-+LDFLAGS=-L$(prefix)/lib -lintl -arch x86_64
++LDFLAGS=-L$(prefix)/lib -lintl
sources=getopt.c
ifeq ($(LIBCGETOPT),0)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150317/300157d7/attachment.html>
More information about the macports-changes
mailing list