diff options
Diffstat (limited to 'package/flex')
| -rw-r--r-- | package/flex/Makefile | 34 | ||||
| -rw-r--r-- | package/flex/patches/patch-Makefile_in | 10 | ||||
| -rw-r--r-- | package/flex/patches/patch-conf_in | 20 |
3 files changed, 16 insertions, 48 deletions
diff --git a/package/flex/Makefile b/package/flex/Makefile index 1bf505504..b5477a623 100644 --- a/package/flex/Makefile +++ b/package/flex/Makefile @@ -1,38 +1,36 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= flex -PKG_VERSION:= 2.5.35 -PKG_RELEASE:= 3 -PKG_HASH:= a6fe3ac80b5f89769d833efde712f95bb0255bcf9089fa324636a9b8a005c717 +PKG_VERSION:= 2.5.39 +PKG_RELEASE:= 1 +PKG_HASH:= c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 PKG_DESCR:= fast lexical analyzer PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host HOST_BUILDDEP:= m4-host PKG_URL:= http://flex.sourceforge.net/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=flex/) PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) hostpost-install: (cd $(STAGING_HOST_DIR)/usr/bin; ln -sf flex lex) flex-install: - ${INSTALL_DIR} ${IDIR_FLEX}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin + $(INSTALL_DIR) $(IDIR_FLEX)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/flex $(IDIR_FLEX)/usr/bin # workaround for dev subpackage - ${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib - ${CP} ${WRKINST}/usr/lib/libfl.a \ - ${IDIR_FLEX_DEV}/usr/lib + $(INSTALL_DIR) $(IDIR_FLEX_DEV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libfl.a \ + $(IDIR_FLEX_DEV)/usr/lib -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/flex/patches/patch-Makefile_in b/package/flex/patches/patch-Makefile_in deleted file mode 100644 index 6c8103d00..000000000 --- a/package/flex/patches/patch-Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- flex-2.5.35.orig/Makefile.in 2008-02-26 22:34:10.000000000 +0100 -+++ flex-2.5.35/Makefile.in 2010-10-04 23:21:19.000000000 +0200 -@@ -483,7 +483,6 @@ libfl.a: $(libfl_a_OBJECTS) $(libfl_a_DE - libfl_pic.a: $(libfl_pic_a_OBJECTS) $(libfl_pic_a_DEPENDENCIES) - -rm -f libfl_pic.a - $(libfl_pic_a_AR) libfl_pic.a $(libfl_pic_a_OBJECTS) $(libfl_pic_a_LIBADD) -- $(RANLIB) libfl_pic.a - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" diff --git a/package/flex/patches/patch-conf_in b/package/flex/patches/patch-conf_in deleted file mode 100644 index b0391feb7..000000000 --- a/package/flex/patches/patch-conf_in +++ /dev/null @@ -1,20 +0,0 @@ ---- flex-2.5.35.orig/conf.in 2008-02-26 22:34:02.000000000 +0100 -+++ flex-2.5.35/conf.in 2010-10-04 23:18:48.000000000 +0200 -@@ -162,7 +162,7 @@ - - /* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be -- automatically deduced at run-time. -+ automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -@@ -190,7 +190,7 @@ - /* Define to rpl_realloc if the replacement function should be used. */ - #undef realloc - --/* Define to `unsigned' if <sys/types.h> does not define. */ -+/* Define to `unsigned int' if <sys/types.h> does not define. */ - #undef size_t - - /* Define as `fork' if `vfork' does not work. */ |