From 0fa44728436968d2630d8c2cda6eec2ad0c84c21 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 27 Mar 2016 18:25:15 +0200 Subject: [PATCH] dev-libs/angelscript: bump to 2.31.0 --- ...2.exheres-0 => angelscript-2.31.0.exheres-0} | 14 +++++--------- .../files/angelscript-2.30.2-install.patch | 17 ----------------- 2 files changed, 5 insertions(+), 26 deletions(-) rename packages/dev-libs/angelscript/{angelscript-2.30.2.exheres-0 => angelscript-2.31.0.exheres-0} (69%) delete mode 100644 packages/dev-libs/angelscript/files/angelscript-2.30.2-install.patch diff --git a/packages/dev-libs/angelscript/angelscript-2.30.2.exheres-0 b/packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0 similarity index 69% rename from packages/dev-libs/angelscript/angelscript-2.30.2.exheres-0 rename to packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0 index 29cda296..1cf610a9 100644 --- a/packages/dev-libs/angelscript/angelscript-2.30.2.exheres-0 +++ b/packages/dev-libs/angelscript/angelscript-2.31.0.exheres-0 @@ -17,10 +17,6 @@ DEPENDENCIES=" WORK=${WORKBASE}/sdk -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-install.patch -) - src_compile() { export CXX=${CXX} AR=${AR} RANLIB=${RANLIB} emake -C ${PN}/projects/gnuc \ @@ -29,10 +25,10 @@ src_compile() { src_install() { emake -C ${PN}/projects/gnuc \ - LIBRARYDEST="${IMAGE}"/usr/$(exhost --target)/lib \ - INCLUDEDEST="${IMAGE}"/usr/$(exhost --target)/include/ install - - insinto /usr/share/doc/${PNVR}/html - doins -r "${WORK}"/docs/* + DESTDIR=${IMAGE} \ + LIBDIR_DEST=usr/$(exhost --target)/lib \ + INCLUDEDIR_DEST=usr/$(exhost --target)/include/ \ + DOCDIR_BASEDIR=usr/share/docs/${PNVR} \ + install install_docs } diff --git a/packages/dev-libs/angelscript/files/angelscript-2.30.2-install.patch b/packages/dev-libs/angelscript/files/angelscript-2.30.2-install.patch deleted file mode 100644 index 19d8c80b..00000000 --- a/packages/dev-libs/angelscript/files/angelscript-2.30.2-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -Source: Julian Ospald -Upstream: not yet -Reason: fix install rules - ---- a/angelscript/projects/gnuc/Makefile -+++ b/angelscript/projects/gnuc/Makefile -@@ -147,8 +147,8 @@ - echo "Skipping creation of symbolic links..."; \ - else \ - ( install -Dm 755 $(LIBDIR)/$(SHLIB) $(LIBRARYDEST)$(LIBNAME)_s-$$ver.so && \ -- ln -fs $(LIBRARYDEST)$(LIBNAME)_s-$$ver.so $(LIBRARYDEST)$(SHLIB) && \ -- ln -fs $(LIBRARYDEST)$(LIBNAME)_s-$$ver.so $(LIBRARYDEST)$(SHLIB).$$ver ) \ -+ ln -fs $(LIBNAME)_s-$$ver.so $(LIBRARYDEST)$(SHLIB) && \ -+ ln -fs $(LIBNAME)_s-$$ver.so $(LIBRARYDEST)$(SHLIB).$$ver ) \ - fi ; - -