[arch-commits] Commit in mujs/trunk (010-mujs-use-arch-flags.patch PKGBUILD)

[Daniel Bermond]

    Date: Thursday, May 14, 2020 @ 17:20:48
  Author: dbermond
Revision: 627948

upgpkg: mujs 1.0.7-1

Modified:
  mujs/trunk/010-mujs-use-arch-flags.patch
  mujs/trunk/PKGBUILD

-------------------------------+
 010-mujs-use-arch-flags.patch |   35 ++++++++++++++++++++++++++++++-----
 PKGBUILD                      |   11 ++++-------
 2 files changed, 34 insertions(+), 12 deletions(-)

Modified: 010-mujs-use-arch-flags.patch
===================================================================
--- 010-mujs-use-arch-flags.patch	2020-05-14 17:12:46 UTC (rev 627947)
+++ 010-mujs-use-arch-flags.patch	2020-05-14 17:20:48 UTC (rev 627948)
@@ -1,6 +1,7 @@
-diff -Naurp a/Makefile b/Makefile
---- a/Makefile	2018-09-11 10:47:31.000000000 +0000
-+++ b/Makefile	2018-12-16 20:19:17.793566976 +0000
+diff --git a/Makefile b/Makefile
+index eacdc49..7b24457 100644
+--- a/Makefile
++++ b/Makefile
 @@ -15,7 +15,7 @@ endif
  
  # Compiler flags for various configurations:
@@ -10,12 +11,36 @@
  
  ifeq "$(CC)" "clang"
    CFLAGS += -Wunreachable-code
-@@ -78,7 +78,7 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
+@@ -30,9 +30,6 @@ ifeq "$(build)" "debug"
+ else ifeq "$(build)" "sanitize"
+   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
+   LDFLAGS += -fsanitize=address
+-else
+-  CFLAGS += -Os
+-  LDFLAGS += -Wl,-s
+ endif
  
+ ifeq "$(HAVE_READLINE)" "yes"
+@@ -67,11 +64,11 @@ jsdump.c: astnames.h opnames.h
+ 
+ $(OUT)/%.o: %.c $(HDRS)
+ 	@ mkdir -p $(dir $@)
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+ 
+ $(OUT)/libmujs.o: one.c $(HDRS)
+ 	@ mkdir -p $(dir $@)
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+ 
+ $(OUT)/libmujs.a: $(OUT)/libmujs.o
+ 	@ mkdir -p $(dir $@)
+@@ -79,7 +76,7 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
+ 
  $(OUT)/libmujs.so: one.c $(HDRS)
  	@ mkdir -p $(dir $@)
 -	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
-+	$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
++	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
  
  $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
  	@ mkdir -p $(dir $@)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-14 17:12:46 UTC (rev 627947)
+++ PKGBUILD	2020-05-14 17:20:48 UTC (rev 627948)
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond at archlinux.org>
 
 pkgname=mujs
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc='An embeddable Javascript interpreter in C'
 arch=('x86_64')
@@ -10,8 +10,8 @@
 depends=('readline')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ccxvii/mujs/archive/${pkgver}.tar.gz"
         '010-mujs-use-arch-flags.patch')
-sha256sums=('a444d8ea22b18eff89acbc7f9e45cc95e5b63b30ae8f4b8000b858cd17006f2d'
-            '051c8a8727f4ff2816e9c060fbe969b7d1e8b9e2c07d704e809c24ff4394f0f4')
+sha256sums=('9081244e070381300acaa5bf306a8b8b6f6231932ef4dca122992d3f6d243446'
+            '93ad3ba48675cf9da33a764742c8188a6b32a27ad4d88f2507252f9ddcd13e37')
 
 prepare() {
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-mujs-use-arch-flags.patch"
@@ -22,10 +22,7 @@
 }
 
 package() {
-    mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-    
     make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" prefix='/usr' install-shared
-    
     install -D -m644 "${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/mujs/LICENSE"
-    install    -m644 "${pkgname}-${pkgver}/docs/"*  "${pkgdir}/usr/share/doc/${pkgname}"
+    install -D -m644 "${pkgname}-${pkgver}/docs/"* -t "${pkgdir}/usr/share/doc/${pkgname}"
 }