diff options
Diffstat (limited to 'patches')
-rw-r--r-- | patches/PDCurses/3.4/mingw32_cross_compile.patch | 87 | ||||
-rw-r--r-- | patches/mingw-libgnurx/2.5.1/build-static-library.patch | 103 |
2 files changed, 190 insertions, 0 deletions
diff --git a/patches/PDCurses/3.4/mingw32_cross_compile.patch b/patches/PDCurses/3.4/mingw32_cross_compile.patch new file mode 100644 index 0000000..060ff9a --- /dev/null +++ b/patches/PDCurses/3.4/mingw32_cross_compile.patch @@ -0,0 +1,87 @@ +--- PDCurses-3.4.orig/win32/mingwin32.mak 2009-11-02 13:50:11.000000000 +0100 ++++ PDCurses-3.4/win32/mingwin32.mak 2009-11-02 13:53:43.000000000 +0100 +@@ -18,7 +18,7 @@ + + PDCURSES_WIN_H = $(osdir)/pdcwin.h + +-CC = gcc ++CC = $(CROSS_COMPILE)gcc + + ifeq ($(DEBUG),Y) + CFLAGS = -g -Wall -DPDCDEBUG +@@ -30,8 +30,8 @@ + + CFLAGS += -I$(PDCURSES_SRCDIR) + +-BASEDEF = $(PDCURSES_SRCDIR)\exp-base.def +-WIDEDEF = $(PDCURSES_SRCDIR)\exp-wide.def ++BASEDEF = $(PDCURSES_SRCDIR)/exp-base.def ++WIDEDEF = $(PDCURSES_SRCDIR)/exp-wide.def + + DEFDEPS = $(BASEDEF) + +@@ -46,17 +46,17 @@ + + DEFFILE = pdcurses.def + +-LINK = gcc ++LINK = $(CROSS_COMPILE)gcc + + ifeq ($(DLL),Y) + CFLAGS += -DPDC_DLL_BUILD +- LIBEXE = gcc $(DEFFILE) ++ LIBEXE = $(CROSS_COMPILE)gcc $(DEFFILE) + LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o + LIBCURSES = pdcurses.dll + LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE) + CLEAN = $(LIBCURSES) *.a $(DEFFILE) + else +- LIBEXE = ar ++ LIBEXE = $(CROSS_COMPILE)ar + LIBFLAGS = rcv + LIBCURSES = pdcurses.a + LIBDEPS = $(LIBOBJS) $(PDCOBJS) +@@ -70,24 +70,24 @@ + libs: $(LIBCURSES) + + clean: +- -del *.o +- -del *.exe +- -del $(CLEAN) ++ -rm *.o ++ -rm *.exe ++ -rm $(CLEAN) + + demos: $(DEMOS) +- strip *.exe ++ $(CROSS_COMPILE)strip *.exe + + $(DEFFILE): $(DEFDEPS) + echo LIBRARY pdcurses > $@ + echo EXPORTS >> $@ +- type $(BASEDEF) >> $@ ++ cat $(BASEDEF) >> $@ + ifeq ($(WIDE),Y) +- type $(WIDEDEF) >> $@ ++ cat $(WIDEDEF) >> $@ + endif + + $(LIBCURSES) : $(LIBDEPS) + $(LIBEXE) $(LIBFLAGS) $@ $? +- -copy pdcurses.a panel.a ++ -cp pdcurses.a panel.a + + $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) + $(PDCOBJS) : $(PDCURSES_WIN_H) +--- PDCurses-3.4.orig/curses.h 2009-11-03 14:12:18.000000000 +0100 ++++ PDCurses-3.4./curses.h 2009-11-03 14:14:09.000000000 +0100 +@@ -82,7 +82,9 @@ + * + */ + ++#ifndef __bool_true_false_are_defined + typedef unsigned char bool; /* PDCurses Boolean type */ ++#endif + + #ifdef CHTYPE_LONG + # if _LP64 diff --git a/patches/mingw-libgnurx/2.5.1/build-static-library.patch b/patches/mingw-libgnurx/2.5.1/build-static-library.patch new file mode 100644 index 0000000..ee7ab16 --- /dev/null +++ b/patches/mingw-libgnurx/2.5.1/build-static-library.patch @@ -0,0 +1,103 @@ +--- mingw-libgnurx-2.5.1.orig/configure 2009-11-03 08:19:15.000000000 +0100 ++++ mingw-libgnurx-2.5.1/configure 2009-11-03 08:31:37.000000000 +0100 +@@ -273,7 +273,7 @@ + PACKAGE_STRING='MinGW libgnurx 2.5.1' + PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=2435&atid=102435' + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CC_QUALIFIED DLLVERSION ZIPCMD ZIPEXT MSVCLIB ac_ct_MSVCLIB GNURX_LIB install_dev LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CC_QUALIFIED AR DLLVERSION ZIPCMD ZIPEXT MSVCLIB ac_ct_MSVCLIB GNURX_LIB install_dev LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -2190,21 +2190,54 @@ + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- ac_ext=c ++ ++for ac_prog in ar; do ++set dummy ${ac_tool_prefix}$ac_prog; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_AR+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ echo "$as_me:$LINENO: result: $AR" >&5 ++echo "${ECHO_T}$AR" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++done ++ ++ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- popCFLAGS=$CFLAGS +- echo 'int main(void){return 0;}' > conftest.$ac_ext +- echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5 ++popCFLAGS=$CFLAGS ++echo 'int main(void){return 0;}' > conftest.$ac_ext ++echo "$as_me:$LINENO: checking whether $CC accepts the -mthreads option" >&5 + echo $ECHO_N "checking whether $CC accepts the -mthreads option... $ECHO_C" >&6 + CFLAGS="$popCFLAGS $CC_QUALIFIED -mthreads" + if (eval $ac_compile) 2>&5; then +@@ -3038,6 +3069,7 @@ + s,@EXEEXT@,$EXEEXT,;t t + s,@OBJEXT@,$OBJEXT,;t t + s,@CC_QUALIFIED@,$CC_QUALIFIED,;t t ++s,@AR@,$AR,;t t + s,@DLLVERSION@,$DLLVERSION,;t t + s,@ZIPCMD@,$ZIPCMD,;t t + s,@ZIPEXT@,$ZIPEXT,;t t +--- mingw-libgnurx-2.5.1.orig/Makefile.in 2009-11-03 08:17:49.000000000 +0100 ++++ mingw-libgnurx-2.5.1/Makefile.in 2009-11-03 08:57:37.000000000 +0100 +@@ -39,6 +39,7 @@ + mandir = @mandir@ + + CC = @CC_QUALIFIED@ ++AR = @AR@ + CFLAGS = @CFLAGS@ -I ${srcdir} + LDFLAGS = @LDFLAGS@ + +@@ -67,8 +68,8 @@ + libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJECTS) + $(CC) $(CFLAGS) -shared -o libgnurx-$(DLLVERSION).dll $(LDFLAGS) $(OBJECTS) + +-libregex.a: libgnurx.dll.a +- cp -p libgnurx.dll.a $@ ++libregex.a: $(OBJECTS) ++ $(AR) cru $@ $(OBJECTS) + + gnurx.lib: libgnurx-$(DLLVERSION).dll |