Ticket #13366: libiconv-universal.2.diff

File libiconv-universal.2.diff, 1.8 KB (added by ryandesign (Ryan Carsten Schmidt), 17 years ago)

includes just Anthony's patch for this issue

  • files/patch-src-Makefile.in-darwin.diff

     
     1--- src/Makefile.in.orig        2007-11-21 22:52:22.000000000 +0100
     2+++ src/Makefile.in     2007-11-21 22:58:15.000000000 +0100
     3@@ -104,6 +104,7 @@
     4        if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
     5        case "@host_os@" in \
     6          hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
     7+         darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
     8          *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
     9        esac
     10        $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
  • Portfile

     
    3737        bin:gperf:gperf
    3838
    3939patchfiles \
    40     patch-utf8mac.diff
     40    patch-utf8mac.diff \
     41    patch-src-Makefile.in-darwin.diff
    4142
    42 pre-fetch {
    43     if {[variant_isset universal]} {
    44         if {![catch {registry_active libiconv}]} {
    45             return -code error "libiconv needs to be deactivated/uninstalled \
    46             before +universal variant can be installed"
    47         }
    48     }
    49 }
    50 
    5143configure.args \
    5244        --enable-static \
    5345        --mandir=${prefix}/share/man \