OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 06-Oct-2002 10:32:18
Branch: HEAD Handle: 2002100609321701
Added files:
openpkg-src/flex flex.patch
Modified files:
openpkg-src/flex flex.spec
openpkg-web news.txt
Log:
Fix the following two problems (as reported today this way to the Flex
authors):
1. In recent Flex versions you introduced some C99 support. At least
the Flex 2.5.21 release is fully broken on non-C99 platforms. For
instance the shipped pre-built scan.c contains non-conditional usage of
<stdint.h> and references to int32_t, etc. This immediately fails. I've
worked around it by doing "flex -oscan.c scan.l" before building (where
"flex" was an old 2.5.4 version).
2. Additionally at least on FreeBSD 4.x the usage of <malloc.h> gives
lots of warnings: /usr/include/malloc.h:2:2: warning: #warning "this
file includes <malloc.h> which is deprecated, use <stdlib.h> instead".
The reason is flexdef.h, line 119. <malloc.h> is really never needed
today on modern systems, so I personally never included it in any
software packages of me. And my packages like GNU Pth and others
were ported to really lots of platforms -- both modern and esoteric
ones. So I recommend you to complete remove likes 118-120, but as a
workaround for myself I used a simple "#if defined(HAVE_MALLOC_H) &&
!defined(__FreeBSD__)" but the complete removal is certainly better.
Summary:
Revision Changes Path
1.3 +11 -0 openpkg-src/flex/flex.patch
1.41 +11 -8 openpkg-src/flex/flex.spec
1.1715 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/flex/flex.patch
============================================================
$ cvs update -p -r1.3 flex.patch
--- flexdef.h.orig Fri Sep 13 03:17:22 2002
+++ flexdef.h Sun Oct 6 10:21:59 2002
@@ -115,7 +115,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
#include <malloc.h>
#endif
#ifdef HAVE_UNISTD_H
Index: openpkg-src/flex/flex.spec
============================================================
$ cvs diff -u -r1.40 -r1.41 flex.spec
--- openpkg-src/flex/flex.spec 18 Sep 2002 09:02:20 -0000 1.40
+++ openpkg-src/flex/flex.spec 6 Oct 2002 08:32:18 -0000 1.41
@@ -43,11 +43,12 @@
Group: Language
License: BSD
Version: %{V_release}
-Release: 20020918
+Release: 20021006
# list of sources
Source0: ftp://ftp.gnu.org/non-gnu/flex/flex-%{V_release}.tar.gz
Source1: ftp://ftp.uncg.edu/people/wlestes/flex-%{V_beta}.tar.gz
+Patch0: flex.patch
# build information
Prefix: %{l_prefix}
@@ -74,26 +75,28 @@
%if "%{with_beta}" == "yes"
%setup1 -q -T -D -a 1
cd flex-%{V_beta}
+ %patch -p0
%endif
%build
-%if "%{with_beta}" == "yes"
- ( cd flex-%{V_beta}
+ ( cd flex-%{V_release_maj}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
- --prefix=%{l_prefix} \
- --disable-nls
+ --prefix=$RPM_BUILD_ROOT%{l_prefix}
%{l_make} %{l_mflags}
)
-%endif
- ( cd flex-%{V_release_maj}
+%if "%{with_beta}" == "yes"
+ ( cd flex-%{V_beta}
+ ../flex-%{V_release_maj}/flex -oscan.c scan.l # WORKAROUND FOR 2.5.21 ONLY!
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
- --prefix=$RPM_BUILD_ROOT%{l_prefix}
+ --prefix=%{l_prefix} \
+ --disable-nls
%{l_make} %{l_mflags}
)
+%endif
%install
rm -rf $RPM_BUILD_ROOT
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1714 -r1.1715 news.txt
--- openpkg-web/news.txt 6 Oct 2002 08:04:32 -0000 1.1714
+++ openpkg-web/news.txt 6 Oct 2002 08:32:17 -0000 1.1715
@@ -1,3 +1,4 @@
+06-Oct-2002: Upgraded package: P<flex-2.5.4a-20021006>
06-Oct-2002: Upgraded package: P<ncurses-5.2.20021005-20021005>
06-Oct-2002: Upgraded package: P<snmp-5.0.6-20021006>
06-Oct-2002: Upgraded package: P<bison-1.50-20021006>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
