diff options
Diffstat (limited to 'package/bison')
| -rw-r--r-- | package/bison/Makefile | 28 | ||||
| -rw-r--r-- | package/bison/patches/patch-Makefile_in | 27 | ||||
| -rw-r--r-- | package/bison/patches/patch-doc_bison_help | 11 |
3 files changed, 14 insertions, 52 deletions
diff --git a/package/bison/Makefile b/package/bison/Makefile index f548b25e2..ad07639cf 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -1,33 +1,33 @@ # 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:= bison -PKG_VERSION:= 3.0.2 +PKG_VERSION:= 3.0.4 PKG_RELEASE:= 1 -PKG_HASH:= a2c3e8528bdb50567d6fa26deeb493dc5ccd7e277b865251608a9e43ac928f3c +PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 PKG_DESCR:= parser generator PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host flex-host bison-host HOST_BUILDDEP:= m4-host flex-host PKG_URL:= http://www.gnu.org/software/bison/ -PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} +PKG_SITES:= $(MASTER_SITE_GNU:=bison/) -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,BISON,bison,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call HOST_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) TARGET_LDFLAGS+= -lrt XAKE_FLAGS+= M4=m4 bison-install: - ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison - ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin - ${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison - $(CP) ./files/yacc ${IDIR_BISON}/usr/bin + $(INSTALL_DIR) $(IDIR_BISON)/usr/bin $(IDIR_BISON)/usr/share/bison + $(INSTALL_BIN) $(WRKINST)/usr/bin/bison $(IDIR_BISON)/usr/bin + $(INSTALL_BIN) ./files/yacc $(IDIR_BISON)/usr/bin + $(CP) $(WRKINST)/usr/share/bison/* $(IDIR_BISON)/usr/share/bison -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/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in deleted file mode 100644 index cf6ade9c5..000000000 --- a/package/bison/patches/patch-Makefile_in +++ /dev/null @@ -1,27 +0,0 @@ ---- bison-3.0.1.orig/Makefile.in 2013-11-12 14:57:09.000000000 +0100 -+++ bison-3.0.1/Makefile.in 2013-11-27 18:46:46.000000000 +0100 -@@ -5134,22 +5134,12 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $( - doc/refcard.pdf: doc/refcard.tex - $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex - $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT) -- $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp -- $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp -+ echo "3.0.1" >doc/bison.help.tmp -+ echo "no help" >>doc/bison.help.tmp - $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@ - - # Depend on configure to get version number changes. - $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure -- $(AM_V_GEN)$(HELP2MAN) \ -- --include=$(top_srcdir)/doc/bison.x \ -- --output=$@.t src/bison$(EXEEXT) -- $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \ -- $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \ -- touch $@; \ -- else \ -- mv $@.t $@; \ -- fi -- $(AM_V_at)rm -f $@*.t - - .gv.eps: - $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'` diff --git a/package/bison/patches/patch-doc_bison_help b/package/bison/patches/patch-doc_bison_help deleted file mode 100644 index c2b452fdf..000000000 --- a/package/bison/patches/patch-doc_bison_help +++ /dev/null @@ -1,11 +0,0 @@ ---- bison-3.0.1.orig/doc/bison.help 2013-11-12 14:57:56.000000000 +0100 -+++ bison-3.0.1/doc/bison.help 2013-11-27 18:41:48.000000000 +0100 -@@ -4,7 +4,7 @@ Written by Robert Corbett and Richard St - Copyright (C) 2013 Free Software Foundation, Inc. - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --Usage: src/bison [OPTION]... FILE -+Usage: bison [OPTION]... FILE - Generate a deterministic LR or generalized LR (GLR) parser employing - LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and - canonical LR(1) support is experimental. |