- contribs: more cygwin/general fixes

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 62678cb7b327780cbc8e281ed47fdee00bd6d718..fcb49890b193f4ebc4c7d54bceb4d5c95b30e99e 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -177,7 +177,7 @@ echo "LD = ${LD}" >> config.mak
 echo "RANLIB = ${RANLIB}" >> config.mak
 echo "AR = ${AR}" >> config.mak
 echo "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}" >> config.mak
-echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -I${PREFIX}/include" >> config.mak
+echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ccd4b594f191ae6de90ddc3ba6d1bc1b0b4fda4c..c147164f7072cc5b5fee2576969619cdcf70577f 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -427,7 +427,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
 
 .freetype: freetype2
 ifdef HAVE_CYGWIN
-       (cd $<; CPPFLAGS="$(EXTRA_CPPFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
+       (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 endif

diff --git a/extras/contrib/src/Patches/dvdnav.patch b/extras/contrib/src/Patches/dvdnav.patch
index b10a9dd976afd7b11eea78c3c2f2e2d1c527584c..357606df9788ae532e639e310753ecddd3e37ee0 100644 (file)
--- a/extras/contrib/src/Patches/dvdnav.patch
+++ b/extras/contrib/src/Patches/dvdnav.patch
@@ -479,7 +479,7 @@ diff -ur libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
  #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
  #define pthread_mutex_destroy(a)
  
-+#ifndef HAVE_GETIMEOFDAY 
++#ifndef HAVE_GETTIMEOFDAY
  /* replacement gettimeofday implementation */
  #include <sys/timeb.h>
  static inline int _private_gettimeofday( struct timeval *tv, void *tz )