patches/PDCurses/3.4/mingw32_cross_compile.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
bartvdrmeulen@2018
     1
--- PDCurses-3.4.orig/win32/mingwin32.mak	2009-11-02 13:50:11.000000000 +0100
bartvdrmeulen@2018
     2
+++ PDCurses-3.4/win32/mingwin32.mak	2009-11-02 13:53:43.000000000 +0100
bartvdrmeulen@2018
     3
@@ -18,7 +18,7 @@
bartvdrmeulen@2018
     4
bartvdrmeulen@2018
     5
 PDCURSES_WIN_H	= $(osdir)/pdcwin.h
bartvdrmeulen@2018
     6
bartvdrmeulen@2018
     7
-CC		= gcc
bartvdrmeulen@2018
     8
+CC		= $(CROSS_COMPILE)gcc
bartvdrmeulen@2018
     9
bartvdrmeulen@2018
    10
 ifeq ($(DEBUG),Y)
bartvdrmeulen@2018
    11
 	CFLAGS  = -g -Wall -DPDCDEBUG
bartvdrmeulen@2018
    12
@@ -30,8 +30,8 @@
bartvdrmeulen@2018
    13
bartvdrmeulen@2018
    14
 CFLAGS += -I$(PDCURSES_SRCDIR)
bartvdrmeulen@2018
    15
bartvdrmeulen@2018
    16
-BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
bartvdrmeulen@2018
    17
-WIDEDEF		= $(PDCURSES_SRCDIR)\exp-wide.def
bartvdrmeulen@2018
    18
+BASEDEF		= $(PDCURSES_SRCDIR)/exp-base.def
bartvdrmeulen@2018
    19
+WIDEDEF		= $(PDCURSES_SRCDIR)/exp-wide.def
bartvdrmeulen@2018
    20
bartvdrmeulen@2018
    21
 DEFDEPS		= $(BASEDEF)
bartvdrmeulen@2018
    22
bartvdrmeulen@2018
    23
@@ -46,17 +46,17 @@
bartvdrmeulen@2018
    24
bartvdrmeulen@2018
    25
 DEFFILE		= pdcurses.def
bartvdrmeulen@2018
    26
bartvdrmeulen@2018
    27
-LINK		= gcc
bartvdrmeulen@2018
    28
+LINK		= $(CROSS_COMPILE)gcc
bartvdrmeulen@2018
    29
bartvdrmeulen@2018
    30
 ifeq ($(DLL),Y)
bartvdrmeulen@2018
    31
 	CFLAGS += -DPDC_DLL_BUILD
bartvdrmeulen@2018
    32
-	LIBEXE = gcc $(DEFFILE)
bartvdrmeulen@2018
    33
+	LIBEXE = $(CROSS_COMPILE)gcc $(DEFFILE)
bartvdrmeulen@2018
    34
 	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
bartvdrmeulen@2018
    35
 	LIBCURSES = pdcurses.dll
bartvdrmeulen@2018
    36
 	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
bartvdrmeulen@2018
    37
 	CLEAN = $(LIBCURSES) *.a $(DEFFILE)
bartvdrmeulen@2018
    38
 else
bartvdrmeulen@2018
    39
-	LIBEXE = ar
bartvdrmeulen@2018
    40
+	LIBEXE = $(CROSS_COMPILE)ar
bartvdrmeulen@2018
    41
 	LIBFLAGS = rcv
bartvdrmeulen@2018
    42
 	LIBCURSES = pdcurses.a
bartvdrmeulen@2018
    43
 	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
bartvdrmeulen@2018
    44
@@ -70,24 +70,24 @@
bartvdrmeulen@2018
    45
 libs:	$(LIBCURSES)
bartvdrmeulen@2018
    46
bartvdrmeulen@2018
    47
 clean:
bartvdrmeulen@2018
    48
-	-del *.o
bartvdrmeulen@2018
    49
-	-del *.exe
bartvdrmeulen@2018
    50
-	-del $(CLEAN)
bartvdrmeulen@2018
    51
+	-rm *.o
bartvdrmeulen@2018
    52
+	-rm *.exe
bartvdrmeulen@2018
    53
+	-rm $(CLEAN)
bartvdrmeulen@2018
    54
bartvdrmeulen@2018
    55
 demos:	$(DEMOS)
bartvdrmeulen@2018
    56
-	strip *.exe
bartvdrmeulen@2018
    57
+	$(CROSS_COMPILE)strip *.exe
bartvdrmeulen@2018
    58
bartvdrmeulen@2018
    59
 $(DEFFILE): $(DEFDEPS)
bartvdrmeulen@2018
    60
 	echo LIBRARY pdcurses > $@
bartvdrmeulen@2018
    61
 	echo EXPORTS >> $@
bartvdrmeulen@2018
    62
-	type $(BASEDEF) >> $@
bartvdrmeulen@2018
    63
+	cat $(BASEDEF) >> $@
bartvdrmeulen@2018
    64
 ifeq ($(WIDE),Y)
bartvdrmeulen@2018
    65
-	type $(WIDEDEF) >> $@
bartvdrmeulen@2018
    66
+	cat $(WIDEDEF) >> $@
bartvdrmeulen@2018
    67
 endif
bartvdrmeulen@2018
    68
bartvdrmeulen@2018
    69
 $(LIBCURSES) : $(LIBDEPS)
bartvdrmeulen@2018
    70
 	$(LIBEXE) $(LIBFLAGS) $@ $?
bartvdrmeulen@2018
    71
-	-copy pdcurses.a panel.a
bartvdrmeulen@2018
    72
+	-cp pdcurses.a panel.a
bartvdrmeulen@2018
    73
bartvdrmeulen@2018
    74
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
bartvdrmeulen@2018
    75
 $(PDCOBJS) : $(PDCURSES_WIN_H)
bartvdrmeulen@2018
    76
--- PDCurses-3.4.orig/curses.h	2009-11-03 14:12:18.000000000 +0100
bartvdrmeulen@2018
    77
+++ PDCurses-3.4./curses.h	2009-11-03 14:14:09.000000000 +0100
bartvdrmeulen@2018
    78
@@ -82,7 +82,9 @@
bartvdrmeulen@2018
    79
  *
bartvdrmeulen@2018
    80
  */
bartvdrmeulen@2018
    81
bartvdrmeulen@2018
    82
+#ifndef __bool_true_false_are_defined
bartvdrmeulen@2018
    83
 typedef unsigned char bool;    /* PDCurses Boolean type */
bartvdrmeulen@2018
    84
+#endif
bartvdrmeulen@2018
    85
bartvdrmeulen@2018
    86
 #ifdef CHTYPE_LONG
bartvdrmeulen@2018
    87
 # if _LP64