Bladeren bron

upgrade to flex-beta 2.5.22

Ralf S. Engelschall 23 jaren geleden
bovenliggende
commit
60c1c62a62
2 gewijzigde bestanden met toevoegingen van 2 en 16 verwijderingen
  1. 0 11
      flex/flex.patch
  2. 2 5
      flex/flex.spec

+ 0 - 11
flex/flex.patch

@@ -1,11 +0,0 @@
---- 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

+ 2 - 5
flex/flex.spec

@@ -31,7 +31,7 @@
 #   package versions
 %define       V_release        2.5.4a
 %define       V_release_maj    2.5.4
-%define       V_beta           2.5.21
+%define       V_beta           2.5.22
 
 #   package information
 Name:         flex
@@ -43,12 +43,11 @@ Distribution: OpenPKG [CORE]
 Group:        Language
 License:      BSD
 Version:      %{V_release}
-Release:      20021006
+Release:      20021011
 
 #   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}
@@ -75,7 +74,6 @@ AutoReqProv:  no
 %if "%{with_beta}" == "yes"
     %setup1 -q -T -D -a 1
     cd flex-%{V_beta}
-    %patch -p0
 %endif
 
 %build
@@ -88,7 +86,6 @@ AutoReqProv:  no
     )
 %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 \