From: Michael Tremer Date: Tue, 8 Dec 2009 10:28:21 +0000 (+0100) Subject: Revert "flex: Provide a shared version of libfl in the package." X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aa1b4429f3d4b617b2dc3aacf0baad4c7b649db;p=ipfire-3.x.git Revert "flex: Provide a shared version of libfl in the package." This reverts commit 25ba07e22916118afef529b95272c430d0c56904. --- diff --git a/pkgs/core/flex/flex.nm b/pkgs/core/flex/flex.nm index 03815685c..b7f9df635 100644 --- a/pkgs/core/flex/flex.nm +++ b/pkgs/core/flex/flex.nm @@ -62,11 +62,6 @@ define STAGE_BUILD --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) - - cd $(DIR_APP) && $(CC) $(CFLAGS) -Wl,-soname,libfl.so.2 -o libfl.so.$(PKG_VER) \ - buf.o ccl.o dfa.o ecs.o filter.o gen.o main.o misc.o nfa.o options.o \ - parse.o regex.o scanflags.o scan.o scanopt.o skel.o sym.o tables.o \ - tables_shared.o tblcmp.o yylex.o -lm endef define STAGE_INSTALL @@ -74,9 +69,5 @@ define STAGE_INSTALL echo "#!/bin/sh" > $(BUILDROOT)/usr/bin/lex echo "exec /usr/bin/flex -l \"$$@\"" >> $(BUILDROOT)/usr/bin/lex chmod 755 $(BUILDROOT)/usr/bin/lex - - -mkdir -pv $(BUILDROOT){,/usr}/lib - install -m 755 $(DIR_APP)/libfl.so.$(PKG_VER) $(BUILDROOT)/lib/libfl.so.$(PKG_VER) - ln -svf libfl.so.$(PKG_VER) $(BUILDROOT)/lib/libfl.so.2 - ln -svf ../../lib/libfl.so.2 $(BUILDROOT)/usr/lib/libfl.so endef +