diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:02:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:02:36 +0100 |
| commit | 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (patch) | |
| tree | b65fd6e8be5c5c51e56265f8a6519c247c8f9576 | |
| parent | 6d9c9a3eed574c29368efb644e76fadd5c2a9fd5 (diff) | |
fix build on Cygwin
| -rw-r--r-- | package/ffmpeg/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/file/Makefile | 4 | ||||
| -rw-r--r-- | package/flac/patches/patch-src_Makefile_in | 20 |
3 files changed, 32 insertions, 3 deletions
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure index d23a61e52..5ff0e14c8 100644 --- a/package/ffmpeg/patches/patch-configure +++ b/package/ffmpeg/patches/patch-configure @@ -1,5 +1,14 @@ --- ffmpeg-0.5.orig/configure 2009-03-01 18:57:14.000000000 +0100 -+++ ffmpeg-0.5/configure 2009-06-12 23:27:05.000000000 +0200 ++++ ffmpeg-0.5/configure 2010-01-06 20:34:48.343750000 +0100 +@@ -1167,7 +1167,7 @@ arch=`uname -m` + cpu="generic" + + # OS +-target_os=$(tolower $(uname -s)) ++target_os=linux + + # configurable options + enable debug @@ -2486,51 +2486,6 @@ cmp -s $TMPH config.h && rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH diff --git a/package/file/Makefile b/package/file/Makefile index 25b371d6e..58650bb0f 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -23,10 +23,10 @@ INSTALL_STYLE:= auto pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - CFLAGS="-static" ./configure --enable-static --disable-shared \ + ./configure \ ); ${MAKE} -C ${WRKBUILD} - ${INSTALL_BIN} ${WRKBUILD}/src/file ${STAGING_TOOLS}/bin + ${INSTALL_BIN} ${WRKBUILD}/src/.libs/file ${STAGING_TOOLS}/bin ${MAKE} -C ${WRKBUILD} clean post-install: diff --git a/package/flac/patches/patch-src_Makefile_in b/package/flac/patches/patch-src_Makefile_in new file mode 100644 index 000000000..026228d7a --- /dev/null +++ b/package/flac/patches/patch-src_Makefile_in @@ -0,0 +1,20 @@ +--- flac-1.2.1.orig/src/Makefile.in 2007-09-16 22:05:09.000000000 +0200 ++++ flac-1.2.1/src/Makefile.in 2010-01-06 21:10:24.984375000 +0100 +@@ -226,8 +226,6 @@ target_alias = @target_alias@ + SUBDIRS = \ + libFLAC \ + share \ +- flac \ +- metaflac \ + monkeys_audio_utilities \ + $(XMMS_DIRS) \ + plugin_winamp2 \ +@@ -255,7 +253,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_SUBDIRS = libFLAC share flac metaflac monkeys_audio_utilities \ ++DIST_SUBDIRS = libFLAC share monkeys_audio_utilities \ + plugin_common plugin_xmms plugin_winamp2 test_grabbag \ + test_libs_common test_libFLAC test_seeking test_streams \ + libFLAC++ test_libFLAC++ |