Commit 44769546 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: fixed libcdio linking on Mac OS X 10.6 and later

parent e539c5ce
--- include/cddb/cddb_ni.h.orig 2009-10-25 21:58:20.000000000 +0100
+++ include/cddb/cddb_ni.h 2009-10-25 21:58:46.000000000 +0100
@@ -35,6 +35,7 @@
# include <iconv.h>
#else
typedef void *iconv_t; /* for code uniformity */
+ #define ICONV_CONST const
#endif
#ifdef HAVE_WINDOWS_H
......@@ -1536,6 +1536,9 @@ ifneq ($(HOST),$(BUILD))
endif
ifdef HAVE_WIN32
(cd $@; patch -p0 < ../Patches/libcddb-win32.patch )
endif
ifdef HAVE_DARWIN_OS
(cd $@; patch -p0 < ../Patches/libcddb-darwin.patch )
endif
patch -p0 < Patches/libcddb-getenv-crash.patch
......@@ -1543,8 +1546,13 @@ ifdef HAVE_WIN32
.cddb: libcddb .regex
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
else
ifdef HAVE_DARWIN_OS
.cddb: libcddb
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS)" && make && make install)
else
.cddb: libcddb
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
endif
endif
touch $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment