libc/mingw: replace mingw32 with generic mingw
Replace the 32-bit-only mingw32 with mingw-w64 that is capable of building toolchains for both 32-bit and 64-bit Windows. kernel/mingw: replace mingw32 with generic Windows kernel/windows: New windows kernel supporting 32 and 64 bit arch libc/mingw: Remove old options patches: Remove old mingw libc options' patches Signed-off-by: "Yann Diorcet" <diorcet.yann@gmail.com> [yann.morin.1998@free.fr: array var in libc/mingw.sh, typos] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Message-Id: <b045ac08fc9eac2e5ee3.1352898499@blackmint> Patchwork-Id: 198901
Yann Diorcet
11 years ago
parent
79a9f857e2
commit
3d01e9f275
@ -1,33 +0,0 @@
|
||||
# mingw32 config options
|
||||
|
||||
## depends on EXPERIMENTAL && ( ARCH_x86 && ARCH_32 )
|
||||
##
|
||||
## select MINGW32
|
||||
##
|
||||
## help Build a toolchain targeting systems running Windows as host
|
||||
|
||||
choice
|
||||
bool
|
||||
prompt "Windows api version"
|
||||
|
||||
# Don't remove next line
|
||||
# CT_INSERT_VERSION_BELOW
|
||||
config W32API_V_3_14
|
||||
bool
|
||||
prompt "3.14"
|
||||
|
||||
config W32API_V_select
|
||||
bool
|
||||
prompt "Other version"
|
||||
|
||||
endchoice
|
||||
|
||||
config W32API_VERSION
|
||||
string
|
||||
prompt "W32 api version" if W32API_V_select
|
||||
# Don't remove next line
|
||||
# CT_INSERT_VERSION_STRING_BELOW
|
||||
default "3.14" if W32API_V_3_14
|
||||
help
|
||||
Enter the version number of the windows api files to use
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
# windows config options
|
||||
|
||||
## depends on EXPERIMENTAL && ARCH_x86
|
||||
##
|
||||
## select WINDOWS
|
||||
##
|
||||
## help Build a toolchain targeting systems running Windows as host
|
||||
@ -1,72 +0,0 @@
|
||||
# Part-2 of mingw C library options: development libraries
|
||||
|
||||
config MINGW_DIRECTX
|
||||
bool
|
||||
prompt "Include DirectX development files"
|
||||
|
||||
config MINGW_OPENGL
|
||||
bool
|
||||
prompt "Include OpenGL development files"
|
||||
|
||||
config MINGW_PDCURSES
|
||||
bool
|
||||
prompt "Include PDCurses (NCurses library) development files"
|
||||
|
||||
choice
|
||||
bool
|
||||
prompt "PDCurses library version"
|
||||
depends on MINGW_PDCURSES
|
||||
|
||||
config MINGW_PDCURSES_V_3_4
|
||||
bool
|
||||
prompt "3.4"
|
||||
|
||||
# CT_INSERT_VERSION_ABOVE
|
||||
# Don't remove above line!
|
||||
|
||||
config MINGW_PDCURSES_V_select
|
||||
bool
|
||||
prompt "Other version"
|
||||
|
||||
endchoice
|
||||
|
||||
config MINGW_PDCURSES_VERSION
|
||||
string
|
||||
prompt "PDCurses library version" if MINGW_PDCURSES_V_select
|
||||
default "3.4" if MINGW_PDCURSES_V_3_4
|
||||
# CT_INSERT_VERSION_STRING_ABOVE
|
||||
# Don't remove above line!
|
||||
help
|
||||
Enter the version number of the PDCurses library to use
|
||||
|
||||
config MINGW_GNURX
|
||||
bool
|
||||
prompt "Include GnuRX (regex library) development files"
|
||||
|
||||
choice
|
||||
bool
|
||||
prompt "GnuRX library version"
|
||||
depends on MINGW_GNURX
|
||||
|
||||
config MINGW_GNURX_V_2_5_1
|
||||
bool
|
||||
prompt "2.5.1"
|
||||
|
||||
# CT_INSERT_VERSION_ABOVE
|
||||
# Don't remove above line!
|
||||
|
||||
config MINGW_GNURX_V_select
|
||||
bool
|
||||
prompt "Other version"
|
||||
|
||||
endchoice
|
||||
|
||||
config MINGW_GNURX_VERSION
|
||||
string
|
||||
prompt "GnuRX library version" if MINGW_GNURX_V_select
|
||||
default "2.5.1" if MINGW_GNURX_V_2_5_1
|
||||
# CT_INSERT_VERSION_STRING_ABOVE
|
||||
# Don't remove above line!
|
||||
help
|
||||
Enter the version number of the Regex library to use
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
--- 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
|
||||
@ -1,103 +0,0 @@
|
||||
--- 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
|
||||
@ -1,3 +0,0 @@
|
||||
reporter_name="Bart vdr. Meulen <bartvdrmeulen@gmail.com>"
|
||||
reporter_url=""
|
||||
reporter_comment="Config to build cross-compiler with mingw as kernel type"
|
||||
@ -0,0 +1,4 @@
|
||||
reporter_name="Yann Diorcet <diorcet.yann@gmail.com>"
|
||||
reporter_url=""
|
||||
reporter_comment="Config to build cross-compiler with mingw as kernel type for
|
||||
32 bits Windows target"
|
||||
@ -0,0 +1,17 @@
|
||||
CT_EXPERIMENTAL=y
|
||||
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
|
||||
CT_SAVE_TARBALLS=y
|
||||
CT_LOG_EXTRA=y
|
||||
CT_ARCH_64=y
|
||||
CT_ARCH_x86=y
|
||||
CT_KERNEL_windows=y
|
||||
CT_BINUTILS_V_2_21_1a=y
|
||||
CT_BINUTILS_PLUGINS=y
|
||||
CT_CC_V_4_5_2=y
|
||||
CT_CC_LANG_CXX=y
|
||||
CT_MINGW_DIRECTX=y
|
||||
CT_MINGW_DDK=y
|
||||
CT_GMP_V_4_3_2=y
|
||||
CT_MPFR_V_2_4_2=y
|
||||
CT_PPL_V_0_10_2=y
|
||||
CT_CLOOG_V_0_15_10=y
|
||||
@ -0,0 +1,4 @@
|
||||
reporter_name="Yann Diorcet <diorcet.yann@gmail.com>"
|
||||
reporter_url=""
|
||||
reporter_comment="Config to build cross-compiler with mingw as kernel type for
|
||||
64 bits Windows target"
|
||||
@ -1,27 +0,0 @@
|
||||
# This file declares functions to install the kernel headers for mingw
|
||||
# Copyright 2009 Bart vdr. Meulen
|
||||
# Licensed under the GPL v2. See COPYING in the root of this package
|
||||
|
||||
CT_DoKernelTupleValues() {
|
||||
CT_TARGET_KERNEL="mingw32"
|
||||
CT_TARGET_SYS=
|
||||
}
|
||||
|
||||
do_kernel_get() {
|
||||
CT_GetFile "w32api-${CT_W32API_VERSION}-mingw32-src" \
|
||||
http://downloads.sourceforge.net/sourceforge/mingw
|
||||
}
|
||||
|
||||
do_kernel_extract() {
|
||||
CT_Extract "w32api-${CT_W32API_VERSION}-mingw32-src"
|
||||
}
|
||||
|
||||
do_kernel_headers() {
|
||||
CT_DoStep INFO "Installing kernel headers"
|
||||
|
||||
mkdir -p "${CT_HEADERS_DIR}"
|
||||
cp -r ${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32-src/include/* \
|
||||
${CT_HEADERS_DIR}
|
||||
|
||||
CT_EndStep
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
# This file declares functions to install the kernel headers for mingw64
|
||||
# Copyright 2012 Yann Diorcet
|
||||
# Licensed under the GPL v2. See COPYING in the root of this package
|
||||
|
||||
CT_DoKernelTupleValues() {
|
||||
# Even we compile for x86_64 target architecture, the target OS have to
|
||||
# bet mingw32 (require by gcc and mingw-w64)
|
||||
CT_TARGET_KERNEL="mingw32"
|
||||
CT_TARGET_SYS=
|
||||
}
|
||||
|
||||
do_kernel_get() {
|
||||
:
|
||||
}
|
||||
|
||||
do_kernel_extract() {
|
||||
:
|
||||
}
|
||||
|
||||
do_kernel_headers() {
|
||||
:
|
||||
}
|
||||
Loading…
Reference in New Issue