[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r7706: some random fixes...
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r7706: some random fixes... |
|
Date: |
Mon, 28 Jun 2021 22:47:53 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 7706
revision-id: carlhansen@gnu.org-20210629024746-eqwyo3wnrozwhpcb
parent: carlhansen@gnu.org-20210627020442-1l434ooeilsejx0x
committer: Carl Hansen <carlhansen@gnu.org>
branch nick: trunk
timestamp: Mon 2021-06-28 19:47:46 -0700
message:
some random fixes...
modified:
pkg/gnu/config/Makefile makefile-20170430231231-0lbw966hs16oxlmd-2
pkg/gnu/fontutils/files/fontutils-0.7-add-info-dir-entry.diff
fontutils0.7addinfod-20160617014725-uokjfnggs70iry9h-2104
pkg/gnu/fontutils/files/fontutils-0.7-fix-build.diff
fontutils0.7fixbuild-20160617014725-uokjfnggs70iry9h-2105
pkg/gnu/gneuralnetwork/Makefile makefile-20180420035111-enovoe3057rzv0uv-3
pkg/gnu/libunistring/Makefile makefile-20160617014725-uokjfnggs70iry9h-1243
pkg/gnu/scm/Makefile makefile-20160617014725-uokjfnggs70iry9h-1693
pkg/gnu/slib/Makefile makefile-20160617014725-uokjfnggs70iry9h-1755
pkg/gnualpha/gcc11snapshot/Makefile makefile-20200504135031-otn1xmukflpi5739-3
pkg/gnualpha/gcc12snapshot/Makefile makefile-20210427033705-fj19fk40drjylrep-3
pkg/gnualpha/gcc12snapshot/sha256sums
sha256sums-20210427033705-fj19fk40drjylrep-4
pkg/other/root/Makefile makefile-20161025063657-4wx3eeqz615u34a7-3
=== modified file 'pkg/gnu/config/Makefile'
--- a/pkg/gnu/config/Makefile 2021-04-18 23:23:50 +0000
+++ b/pkg/gnu/config/Makefile 2021-06-29 02:47:46 +0000
@@ -56,7 +56,7 @@
include config.mk
# no download directory
-.PHONY: check gitpull fetch
+.PHONY: check gitpull fetch-my build-my install-my
gitpull:
(cd $(WORKDIR)/$(GARNAME); git pull)
=== modified file
'pkg/gnu/fontutils/files/fontutils-0.7-add-info-dir-entry.diff'
Binary files a/pkg/gnu/fontutils/files/fontutils-0.7-add-info-dir-entry.diff
2016-06-17 19:08:15 +0000 and
b/pkg/gnu/fontutils/files/fontutils-0.7-add-info-dir-entry.diff 2021-06-29
02:47:46 +0000 differ
=== modified file 'pkg/gnu/fontutils/files/fontutils-0.7-fix-build.diff'
Binary files a/pkg/gnu/fontutils/files/fontutils-0.7-fix-build.diff
2021-06-18 23:18:34 +0000 and
b/pkg/gnu/fontutils/files/fontutils-0.7-fix-build.diff 2021-06-29 02:47:46
+0000 differ
=== modified file 'pkg/gnu/gneuralnetwork/Makefile'
--- a/pkg/gnu/gneuralnetwork/Makefile 2019-11-11 06:28:39 +0000
+++ b/pkg/gnu/gneuralnetwork/Makefile 2021-06-29 02:47:46 +0000
@@ -43,8 +43,10 @@
include ../../../gar/gar.lib/auto.mk
include config.mk
+.PHONY: pre-install
pre-install:
mkdir -p $(packageprefix)/man/man1
cp $(WORKSRC)/doc/*1 $(packageprefix)/man/man1
+ $(MAKECOOKIE)
=== modified file 'pkg/gnu/libunistring/Makefile'
--- a/pkg/gnu/libunistring/Makefile 2021-06-09 02:07:25 +0000
+++ b/pkg/gnu/libunistring/Makefile 2021-06-29 02:47:46 +0000
@@ -55,8 +55,7 @@
# before make-ing. This script imports files from GNULIB_SRCDIR
-.PHONY: gitpull
-.PHONY: custom-build custom-pre-install custom-install
+.PHONY: gitpull fetch-my configure-my custom-build custom-pre-install
gitpull:
(cd $(WORKSRC); git pull)
=== modified file 'pkg/gnu/scm/Makefile'
--- a/pkg/gnu/scm/Makefile 2020-02-22 23:38:53 +0000
+++ b/pkg/gnu/scm/Makefile 2021-06-29 02:47:46 +0000
@@ -66,7 +66,7 @@
# build scmlit
pre-build: configure
- cd $(WORKDIR) && ln -s scm-$(GARVERSION) scm
+ cd $(WORKDIR) && ln -f -s scm-$(GARVERSION) scm
@printf "[$(OK)build scmlit$(OFF)] $(MSG)Running make scmlit$(OFF)\n"
sed -i '/$$(DESTDIR)$$(bindir)scm -br new-catalog/d' \
$(WORKSRC)/Makefile
=== modified file 'pkg/gnu/slib/Makefile'
--- a/pkg/gnu/slib/Makefile 2020-02-22 23:38:53 +0000
+++ b/pkg/gnu/slib/Makefile 2021-06-29 02:47:46 +0000
@@ -20,7 +20,7 @@
#
# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
-NAME = SLIB
+NAME = SLIB scheme library
GARNAME = slib
GARVERSION = 3b6
HOME_URL = http://www.gnu.org/software/slib
@@ -41,26 +41,38 @@
SIGFILES = $(DISTNAME).tar.gz.sig
BUILDDEPS =
-#guile and/or scm
+# guile, scm, or other scheme; see README
LIBDEPS =
######################################################################
-
+CONFIGURE_SCRIPTS = my
+BUILD_SCRIPTS = my
INSTALL_SCRIPTS = $(INSTALL_TARGETS) info
+
include ../../../gar/gar.lib/auto.mk
include ../../../gar/gar.lib/info.mk
include config.mk
+.PHONY: post-extract configure-my build-my custom-pre-install install-guile
+
post-extract:
- cd $(WORKDIR) && ln -s $(DISTNAME) slib
+ cd $(WORKDIR) && ln -f -s $(DISTNAME) slib
+ echo mkdir -p $(packageprefix)/share/slib
mkdir -p $(packageprefix)/share/slib
$(MAKECOOKIE)
# cp -r $(WORKSRC)/* $(packageprefix)/share/slib
-
-build: configure
+#
+
+configure-my:
+ cd $(WORKSRC) && ./configure --prefix=$(prefix)
+ $(MAKECOOKIE)
+
+
+
+build-my: configure
echo make infoz
- make -C $(WORKSRC) infoz
+ $(MAKE) -C $(WORKSRC) infoz
$(MAKECOOKIE)
custom-pre-install:
@@ -68,11 +80,11 @@
DESTDIR=$(packageprefix) && make -C $(WORKSRC) install
$(MAKECOOKIE)
-#install-guile:
-# @echo -e "[$(OK)install$(OFF)] $(MSG)Installing SLIB for Guile$(OFF)"
-# @$(MAKE) -C $(WORKSRC) install-lib DESTDIR=$(packagedestdir) \
-# libdir=$(prefix)/share/guile/ $(OUTPUT)
-# $(MAKECOOKIE)
+install-guile:
+ @echo -e "[$(OK)install$(OFF)] $(MSG)Installing SLIB for Guile$(OFF)"
+ @$(MAKE) -C $(WORKSRC) install-lib DESTDIR=$(packagedestdir) \
+ libdir=$(prefix)/share/guile/ $(OUTPUT)
+ $(MAKECOOKIE)
#install-system: install-$(WORKSRC)/Makefile-DESTDIR
# $(MAKECOOKIE)
@@ -83,3 +95,25 @@
# $(MAKECOOKIE)
+#tentative
+#custom-pre-install: custom-build
+# @echo $(prefix)/packages/$(DISTNAME)
+# mkdir -p $(prefix)/packages/$(DISTNAME)
+# mkdir -p $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)
+# mkdir -p $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/include
+# mkdir -p $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/lib
+# mkdir -p $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/share/doc
+# mkdir -p $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/share/info
+# (cd $(WORKSRC)/lib; cp -a \
+# unicase.h unictype.h unilbrk.h uninorm.h unistr.h
unitypes.h uniwidth.h \
+# uniconv.h unigbrk.h uniname.h unistdio.h unistring/
uniwbrk.h \
+# $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/include )
+# (cd $(WORKSRC)/lib/.libs; cp -a libunistring.a libunistring.so
libunistring.so.2 libunistring.so.2.1.0 \
+# $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/lib)
+# (cd $(WORKSRC)/doc; cp *.html \
+# $(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/share/doc)
+# (cd $(WORKSRC)/doc; cp *.info \
+#
$(prefix)/packages/$(DISTNAME)-DEST/$(prefix)/share/info)
+# ls -Ral $(prefix)/packages/$(DISTNAME)-DEST
+# $(MAKECOOKIE)
+#
=== modified file 'pkg/gnualpha/gcc11snapshot/Makefile'
--- a/pkg/gnualpha/gcc11snapshot/Makefile 2021-06-27 02:04:42 +0000
+++ b/pkg/gnualpha/gcc11snapshot/Makefile 2021-06-29 02:47:46 +0000
@@ -175,7 +175,7 @@
BUILD_ARGS = CFLAGS+="--save-temps -Wall -Wextra -fno-split-stack" \
CXXFLAGS+="--save-temps -Wall -Wextra -fno-split-stack" \
- CPPFLAGS="-I. -I.. -DGATHER_STATISTICS=0 -UHAVE_STRSIGNAL=1
-DHAVE_DECL_BASENAME=1 -DHAVE_DECL_STRSIGNAL=1 \
+ CPPFLAGS="-I. -I.. -DGATHER_STATISTICS=0 -UHAVE_STRSIGNAL
-DHAVE_DECL_BASENAME=1 -DHAVE_DECL_STRSIGNAL=1 \
-DENABLE_OFFLOADING=0 -DCHECKING_P=0 "
# -DENABLE_DECIMAL_FLOAT=1 -DENABLE_DECIMAL_BID_FORMAT=1 \
# -DSIZEOF_VOID_P=8 -DHAVE_AS_LEB128=1
-DHAVE_GAS_CFI_PERSONALITY_DIRECTIVE=1 -DHAVE_GAS_SHF_MERGE=1 \
=== modified file 'pkg/gnualpha/gcc12snapshot/Makefile'
--- a/pkg/gnualpha/gcc12snapshot/Makefile 2021-06-22 15:03:50 +0000
+++ b/pkg/gnualpha/gcc12snapshot/Makefile 2021-06-29 02:47:46 +0000
@@ -22,7 +22,7 @@
NAME = The GNU Compiler Collection version 12 development version
GARNAME = gcc12snapshot
UPSTREAMNAME = gcc
-GARVERSION = 12-20210620
+GARVERSION = 12-20210627
HOME_URL = http://www.gnu.org/software/gcc
DESCRIPTION = GNU Compiler Collection 12 snapshot
define BLURB
=== modified file 'pkg/gnualpha/gcc12snapshot/sha256sums'
--- a/pkg/gnualpha/gcc12snapshot/sha256sums 2021-06-14 01:45:05 +0000
+++ b/pkg/gnualpha/gcc12snapshot/sha256sums 2021-06-29 02:47:46 +0000
@@ -1,1 +1,1 @@
-af053fe0ffebc344ba9b9cfa8c5f96ae594dfc44ceb0eb615c24aafe88e9f442
download/gcc-12-20210613.tar.xz
+e4361f3ad6ffaedd8c472a02ecb2a888293c1598e3c9c3219b785bd8f1908293
download/gcc-12-20210627.tar.xz
=== modified file 'pkg/other/root/Makefile'
--- a/pkg/other/root/Makefile 2021-04-15 18:33:58 +0000
+++ b/pkg/other/root/Makefile 2021-06-29 02:47:46 +0000
@@ -61,9 +61,8 @@
######################################################################
#CONFIGURE_OPTS += -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1
+
include ../../../gar/gar.lib/cmake.mk
-# include ../../../gar/gar.lib/auto.mk
-
include config.mk
# might be used:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r7706: some random fixes...,
Carl Hansen <=