Commit 5302b07d authored by bgermann's avatar bgermann

Import cygport version 3.10.0-1

[CYGPORT]
* NEW: Import cygport version 3.10.0-1
parent 8eb8de34
Index: main/lib/term/cterm.c
===================================================================
--- main/lib/term/cterm.c (Revision 8174)
+++ main/lib/term/cterm.c (Arbeitskopie)
@@ -185,25 +185,28 @@
IMPLEMENT_TSP(PARODD, c_cflag)
IMPLEMENT_TSP(HUPCL, c_cflag)
IMPLEMENT_TSP(CLOCAL, c_cflag)
-IMPLEMENT_TSP(CMSPAR, c_cflag)
IMPLEMENT_TSP(CRTSCTS, c_cflag)
IMPLEMENT_TSP(ISIG, c_lflag)
IMPLEMENT_TSP(ICANON, c_lflag)
-IMPLEMENT_TSP(XCASE, c_lflag)
IMPLEMENT_TSP(ECHO, c_lflag)
IMPLEMENT_TSP(ECHOE, c_lflag)
IMPLEMENT_TSP(ECHOK, c_lflag)
IMPLEMENT_TSP(ECHONL, c_lflag)
IMPLEMENT_TSP(ECHOCTL, c_lflag)
-IMPLEMENT_TSP(ECHOPRT, c_lflag)
IMPLEMENT_TSP(ECHOKE, c_lflag)
IMPLEMENT_TSP(FLUSHO, c_lflag)
IMPLEMENT_TSP(NOFLSH, c_lflag)
IMPLEMENT_TSP(TOSTOP, c_lflag)
-IMPLEMENT_TSP(PENDIN, c_lflag)
IMPLEMENT_TSP(IEXTEN, c_lflag)
+#ifndef OS_CYGWIN
+IMPLEMENT_TSP(CMSPAR, c_cflag)
+IMPLEMENT_TSP(XCASE, c_lflag)
+IMPLEMENT_TSP(ECHOPRT, c_lflag)
+IMPLEMENT_TSP(PENDIN, c_lflag)
+#endif
+
IMPLEMENT_TSP_C(VDISCARD)
IMPLEMENT_TSP_C(VEOF)
IMPLEMENT_TSP_C(VEOL)
@@ -326,7 +329,10 @@
GB_CONSTANT("VDISABLE", "i", _POSIX_VDISABLE),
- __TC(B0), __TC(B50), __TC(B75), __TC(B110), __TC(B134), __TC(B150), __TC(B200), __TC(B300), __TC(B600), __TC(B1200), __TC(B1800), __TC(B2400), __TC(B4800), __TC(B9600), __TC(B19200), __TC(B38400), __TC(B57600), __TC(B115200), __TC(B230400), __TC(B460800), __TC(B500000), __TC(B576000), __TC(B921600), __TC(B1000000), __TC(B1152000), __TC(B1500000), __TC(B2000000), __TC(B2500000), __TC(B3000000), __TC(B3500000), __TC(B4000000),
+ __TC(B0), __TC(B50), __TC(B75), __TC(B110), __TC(B134), __TC(B150), __TC(B200), __TC(B300), __TC(B600), __TC(B1200), __TC(B1800), __TC(B2400), __TC(B4800), __TC(B9600), __TC(B19200), __TC(B38400), __TC(B57600), __TC(B115200), __TC(B230400), __TC(B460800), __TC(B500000), __TC(B576000), __TC(B921600), __TC(B1000000), __TC(B1152000), __TC(B1500000), __TC(B2000000), __TC(B2500000), __TC(B3000000),
+#ifndef OS_CYGWIN
+__TC(B3500000), __TC(B4000000),
+#endif
GB_END_DECLARE
};
@@ -376,25 +382,28 @@
__TSP(PARODD),
__TSP(HUPCL),
__TSP(CLOCAL),
- __TSP(CMSPAR),
__TSP(CRTSCTS),
__TSP(ISIG),
__TSP(ICANON),
- __TSP(XCASE),
__TSP(ECHO),
__TSP(ECHOE),
__TSP(ECHOK),
__TSP(ECHONL),
__TSP(ECHOCTL),
- __TSP(ECHOPRT),
__TSP(ECHOKE),
__TSP(FLUSHO),
__TSP(NOFLSH),
__TSP(TOSTOP),
- __TSP(PENDIN),
__TSP(IEXTEN),
+#ifndef OS_CYGWIN
+ __TSP(CMSPAR),
+ __TSP(XCASE),
+ __TSP(ECHOPRT),
+ __TSP(PENDIN),
+#endif
+
__TSP_I(VDISCARD),
__TSP_I(VEOF),
__TSP_I(VEOL),
Index: gb.xml/src/gb.xml.h
===================================================================
--- gb.xml/src/gb.xml.h (Revision 8174)
+++ gb.xml/src/gb.xml.h (Arbeitskopie)
@@ -192,7 +192,7 @@
void (*ThrowXMLParseException)(const char* nerror, const char *text, const size_t lenText, const char *posFailed);
-#if defined(OS_MACOSX) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(OS_MACOSX) || defined(__APPLE__)
void* (*memrchr)(const char *s, int c, size_t n);
#endif
Index: gb.xml/src/html/htmlmain.h
===================================================================
--- gb.xml/src/html/htmlmain.h (Revision 8174)
+++ gb.xml/src/html/htmlmain.h (Arbeitskopie)
@@ -28,7 +28,7 @@
extern "C" XML_INTERFACE XML;
#endif
-#if defined(OS_MACOSX) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(OS_MACOSX) || defined(__APPLE__)
#define memrchr(s, c, n) XML.memrchr(s, c, n)
#endif
Index: gb.xml/src/main.cpp
===================================================================
--- gb.xml/src/main.cpp (Revision 8174)
+++ gb.xml/src/main.cpp (Arbeitskopie)
@@ -104,7 +104,7 @@
(void *)ThrowXMLParseException,
- #if defined(OS_MACOSX) || defined(__APPLE__) || defined(__CYGWIN__)
+ #if defined(OS_MACOSX) || defined(__APPLE__)
(void*)memrchr,
#endif
Index: gb.xml/src/utils.cpp
===================================================================
--- gb.xml/src/utils.cpp (Revision 8174)
+++ gb.xml/src/utils.cpp (Arbeitskopie)
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <memory.h>
-#if defined(OS_MACOSX) || defined(__CYGWIN__)
+#if defined(OS_MACOSX)
void *memrchr(const char *s, int c, size_t n)
{
const char *start=s,*end=(s+n-1);
Index: gb.xml/src/utils.h
===================================================================
--- gb.xml/src/utils.h (Revision 8174)
+++ gb.xml/src/utils.h (Arbeitskopie)
@@ -26,7 +26,7 @@
#define CHAR_ERROR 0xFFFD // �
-#if defined(OS_MACOSX) || defined(__CYGWIN__)
+#if defined(OS_MACOSX)
#include <string.h>
void *memrchr(const char *s, int c, size_t n);
#endif
......@@ -3,7 +3,7 @@
# It follows the guideline "How To Package Gambas" (http://gambaswiki.org/wiki/howto/package).
NAME="gambas3"
VERSION=3.9.2
VERSION=3.10.0
RELEASE=1
HOMEPAGE="http://gambas.sourceforge.net"
......@@ -11,13 +11,15 @@ DEPEND="pkgconfig(libffi) pkgconfig(libpcre) pkgconfig(zlib) pkgconfig(cairo) pk
SRC_URI="mirror://sourceforge/gambas/${P}.tar.bz2"
PATCH_URI="${PN}-libpq.patch ${PN}-generic-odbc.patch"
PATCH_URI="${PN}-cterm.patch ${PN}-libpq.patch ${PN}-generic-odbc.patch ${PN}-xml-memrchr-revert.patch"
# Disable gb.v4l (deprecated) and gb.inotify, because they cannot be built for cygwin.
# Disable gb.db.sqlite2 (deprecated), because sqlite2 is not available in the standard repository.
CYGCONF_ARGS="--disable-inotify --disable-v4l --disable-sqlite2"
CPPFLAGS="-D_GNU_SOURCE"
export LLVM_CONFIG=llvm-config-3.5
src_compile() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment