From 0cf35ec2ad7aa685d424a0ff36ff058975eacd34 Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 19 Apr 2015 00:05:44 +0000 Subject: - Remove compat files. Upstream ships them now in lib. - Fix build of compat library. Needs to use libtool objects (.lo) since linking is done with libtool. --- devel/flex/distinfo | 7 +++--- devel/flex/patches/patch-aa | 37 -------------------------------- devel/flex/patches/patch-ab | 11 +--------- devel/flex/patches/patch-ac | 31 -------------------------- devel/flex/patches/patch-lib_Makefile.in | 25 +++++++++++++++++++++ 5 files changed, 29 insertions(+), 82 deletions(-) delete mode 100644 devel/flex/patches/patch-aa delete mode 100644 devel/flex/patches/patch-ac create mode 100644 devel/flex/patches/patch-lib_Makefile.in (limited to 'devel') diff --git a/devel/flex/distinfo b/devel/flex/distinfo index 88fecb15cb7..becfdef44ef 100644 --- a/devel/flex/distinfo +++ b/devel/flex/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.18 2014/08/23 07:46:38 obache Exp $ +$NetBSD: distinfo,v 1.19 2015/04/19 00:05:44 tnn Exp $ SHA1 (flex-2.5.39.tar.xz) = 415e82bb0dc9b1713fc4802a9db2274cd8d2909a RMD160 (flex-2.5.39.tar.xz) = b5c9555d1fe48086d96475cf41ca800e8138514d Size (flex-2.5.39.tar.xz) = 1347436 bytes SHA1 (patch-Makefile.am) = 7828c75f891db84b3be1719808b76542a24fdd74 -SHA1 (patch-aa) = 938335a9071be62f534bad8e785003318816fd38 -SHA1 (patch-ab) = 1a2b83af62151ccc09ad0bf74e0ff84d9a97d53f -SHA1 (patch-ac) = 27ac026f8a180b49523933c5d70db0237e8dc095 +SHA1 (patch-ab) = 44497cff83005702dfcb36d490746e47757ae299 SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045 +SHA1 (patch-lib_Makefile.in) = b76d7083939a6e6efd865b45c37023de5058c6f6 diff --git a/devel/flex/patches/patch-aa b/devel/flex/patches/patch-aa deleted file mode 100644 index 7855e53d5e7..00000000000 --- a/devel/flex/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2008/02/21 18:57:46 tnn Exp $ - ---- /dev/null 2008-02-21 19:43:14.000000000 +0100 -+++ realloc.c -@@ -0,0 +1,32 @@ -+/* rpl_realloc.c -- a replacement for broken realloc implementations -+ Copyright (C) 2001 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#include -+ -+void * -+rpl_realloc(void *ptr, size_t size) -+{ -+ if (!ptr) -+ return malloc(size); -+ if (!size) -+ { -+ if (ptr) -+ free(ptr); -+ return malloc(size); -+ } -+ return realloc(ptr, size); -+} diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab index 8618efb3091..2ae00283ad5 100644 --- a/devel/flex/patches/patch-ab +++ b/devel/flex/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2014/08/23 07:46:38 obache Exp $ +$NetBSD: patch-ab,v 1.8 2015/04/19 00:05:44 tnn Exp $ * XXX: * Prevent libfi to be linked with libintl. @@ -6,15 +6,6 @@ $NetBSD: patch-ab,v 1.7 2014/08/23 07:46:38 obache Exp $ --- Makefile.in.orig 2014-03-26 18:58:57.000000000 +0000 +++ Makefile.in -@@ -165,7 +165,7 @@ am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OB - options.$(OBJEXT) scanopt.$(OBJEXT) buf.$(OBJEXT) \ - tables.$(OBJEXT) tables_shared.$(OBJEXT) filter.$(OBJEXT) \ - regex.$(OBJEXT) --flex_OBJECTS = $(am_flex_OBJECTS) -+flex_OBJECTS = $(am_flex_OBJECTS) $(LIBOBJS) - flex_LDADD = $(LDADD) - flex_DEPENDENCIES = lib/libcompat.la - DEFAULT_INCLUDES = -I.@am__isrc@ @@ -304,7 +304,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ diff --git a/devel/flex/patches/patch-ac b/devel/flex/patches/patch-ac deleted file mode 100644 index d4f68c2d408..00000000000 --- a/devel/flex/patches/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2008/05/21 12:54:32 tnn Exp $ - ---- /dev/null 2008-04-01 06:44:07.000000000 +0200 -+++ malloc.c -@@ -0,0 +1,26 @@ -+/* rpl_malloc.c -- a replacement for malloc that don't accept 0 size -+ Copyright (C) 2001 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include -+ -+void * -+rpl_malloc(size_t size) -+{ -+ if (!size) -+ size++; -+ return malloc(size); -+} diff --git a/devel/flex/patches/patch-lib_Makefile.in b/devel/flex/patches/patch-lib_Makefile.in new file mode 100644 index 00000000000..1b50b233763 --- /dev/null +++ b/devel/flex/patches/patch-lib_Makefile.in @@ -0,0 +1,25 @@ +$NetBSD: patch-lib_Makefile.in,v 1.1 2015/04/19 00:05:44 tnn Exp $ + +The compat library is linked with libtool so we must use .lo objects +consistently. + +--- lib/Makefile.in.orig 2014-03-26 18:58:56.000000000 +0000 ++++ lib/Makefile.in +@@ -70,7 +70,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libcompat_la_DEPENDENCIES = $(LIBOBJS) ++libcompat_la_DEPENDENCIES = $(LTLIBOBJS) + am_libcompat_la_OBJECTS = lib.lo + libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -244,7 +244,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + noinst_LTLIBRARIES = libcompat.la + libcompat_la_SOURCES = lib.c +-libcompat_la_LIBADD = $(LIBOBJS) ++libcompat_la_LIBADD = $(LTLIBOBJS) + all: all-am + + .SUFFIXES: -- cgit v1.2.3