Revision: 102564 https://trac.macports.org/changeset/102564 Author: cal@macports.org Date: 2013-02-04 14:23:35 -0800 (Mon, 04 Feb 2013) Log Message: ----------- libcomerr: fix universal build, closes #37922 Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 22:07:01 UTC (rev 102563) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 22:23:35 UTC (rev 102564) @@ -5,6 +5,7 @@ name e2fsprogs version 1.42.7 +revision 1 categories sysutils platforms darwin maintainers nomaintainer @@ -26,22 +27,23 @@ depends_build port:pkgconfig depends_lib port:gettext +patchfiles patch-lib__Makefile.darwin-lib + configure.args-append --enable-bsd-shlibs # This project is not C99 conformant configure.cflags-append -std=gnu89 -universal_variant no +if {${name} == ${subport}} { + universal_variant no -if {${name} == ${subport}} { configure.args-append --disable-libuuid \ --disable-uuidd depends_lib-append port:ossp-uuid \ port:libcomerr - patchfiles-append patch-lib__Makefile.darwin-lib \ - patch-Makefile.in-remove-included-libcomerr.diff + patchfiles-append patch-Makefile.in-remove-included-libcomerr.diff if {[string match *clang* ${configure.compiler}]} { # return type conflicts should really be fixed Modified: trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib =================================================================== --- trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib 2013-02-04 22:07:01 UTC (rev 102563) +++ trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib 2013-02-04 22:23:35 UTC (rev 102564) @@ -5,7 +5,7 @@ $(BSD_LIB): $(OBJS) $(E) " GEN_BSD_SOLIB $(BSD_LIB)" - $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \ -+ $(Q) (cd pic; $(CC) -dynamiclib -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) -Wl,-single_module \ ++ $(Q) (cd pic; $(CC) $(LDFLAGS) -dynamiclib -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) -Wl,-single_module \ -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS)) $(Q) $(MV) pic/$(BSD_LIB) . $(Q) $(RM) -f ../$(BSD_LIB)