[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r8598: assortment , important build fix
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r8598: assortment , important build fix |
|
Date: |
Mon, 26 Sep 2022 00:05:29 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 8598
revision-id: carlhansen@gnu.org-20220926040516-djzj6wpqxj5x4u33
parent: carlhansen@gnu.org-20220924055157-i61muy3dbe8gvght
committer: Carl Hansen <carlhansen@gnu.org>
branch nick: trunk
timestamp: Sun 2022-09-25 21:05:16 -0700
message:
assortment , important build fix
modified:
gar/gar.lib/cmake.mk cmake.mk-20160617013740-b2gc1gamt0k7pzjx-4
gar/gar.mk gar.mk-20160617013745-r4h3dj0kiuppihsx-1
pkg/bio/openms/Makefile makefile-20160617195624-kwz1a09vkg4le6fu-144
pkg/freedesktop/colord/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-389
pkg/freedesktop/dbus/Makefile makefile-20161013235839-fqaf2lyouz16stuf-1
pkg/gnu/autoconf/Makefile makefile-20160617014725-uokjfnggs70iry9h-423
pkg/gnu/binutils/Makefile makefile-20160617014725-uokjfnggs70iry9h-456
pkg/gnu/config/Makefile makefile-20170430231231-0lbw966hs16oxlmd-2
pkg/gnu/fontutils/Makefile makefile-20160617014725-uokjfnggs70iry9h-647
pkg/gnu/fontutils/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-649
pkg/gnu/linux-libre/Makefile makefile-20160617014725-uokjfnggs70iry9h-1266
pkg/gnu/oleo/Makefile makefile-20160617014725-uokjfnggs70iry9h-1494
pkg/gnu/parallel/gpg-keyring gpgkeyring-20160617014725-uokjfnggs70iry9h-1522
pkg/other/cmake/Makefile makefile-20161012192420-6gwv2zkyfuom987t-2
pkg/other/libtiff/Makefile makefile-20211031231333-yk9ick1u1m7z7quo-3
pkg/other/stage0/Makefile makefile-20181231165537-j82mtys03wvbqa2z-3
=== modified file 'gar/gar.lib/cmake.mk'
--- a/gar/gar.lib/cmake.mk 2019-06-14 21:05:57 +0000
+++ b/gar/gar.lib/cmake.mk 2022-09-26 04:05:16 +0000
@@ -26,3 +26,5 @@
# is this applicable?
BUILD_ARGS += $(if $(USE_PARALLEL),$(MAKE_ARGS_PARALLEL),)
+
+
=== modified file 'gar/gar.mk'
--- a/gar/gar.mk 2022-09-22 21:13:51 +0000
+++ b/gar/gar.mk 2022-09-26 04:05:16 +0000
@@ -60,6 +60,7 @@
# and know how to get back out of it to the port dir.
# old WORKOBJ ?= $(WORKSRC)
# cwh
+#WORKOBJ ?= $(WORKDIR)/$(GARNANE)-build
WORKOBJ ?= $(WORKSRC)-build
WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
@@ -87,7 +88,7 @@
#################### DIRECTORY MAKERS ####################
# This is to make dirs as needed by the base rules
-$(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR)
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(DOWNLOADDIRGIT)) :
+$(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKOBJ) $(WORKDIR)
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(DOWNLOADDIRGIT)) :
@echo ------ check $@
@if test -d "$@"; then : ; else \
mkdir -p "$@"; \
=== modified file 'pkg/bio/openms/Makefile'
--- a/pkg/bio/openms/Makefile 2016-06-22 04:58:40 +0000
+++ b/pkg/bio/openms/Makefile 2022-09-26 04:05:16 +0000
@@ -36,7 +36,7 @@
DISTFILES = $(DISTNAME).tar.gz
BUILDDEPS =
-LIBDEPS = seqan glpk gsl xerces libsvm
+LIBDEPS = #: seqan glpk gsl xerces libsvm
######################################################################
=== modified file 'pkg/freedesktop/colord/Makefile'
--- a/pkg/freedesktop/colord/Makefile 2021-05-02 05:27:42 +0000
+++ b/pkg/freedesktop/colord/Makefile 2022-09-26 04:05:16 +0000
@@ -45,3 +45,7 @@
include ../../../gar/gar.lib/mesonninja.mk
include config.mk
+inf:
+ echo $(WORKSRC)
+ echo $(WORKOBJ)
+
=== modified file 'pkg/freedesktop/dbus/Makefile'
--- a/pkg/freedesktop/dbus/Makefile 2022-04-04 18:20:25 +0000
+++ b/pkg/freedesktop/dbus/Makefile 2022-09-26 04:05:16 +0000
@@ -45,8 +45,12 @@
BUILDDEPS =
LIBDEPS =
+WORKOBJ = $(WORKSRC)-build
+
######################################################################
include ../../../gar/gar.lib/cmake.mk
include config.mk
+inf:
+ echo $(WORKOBJ)
=== modified file 'pkg/gnu/autoconf/Makefile'
--- a/pkg/gnu/autoconf/Makefile 2021-01-29 00:56:07 +0000
+++ b/pkg/gnu/autoconf/Makefile 2022-09-26 04:05:16 +0000
@@ -49,3 +49,7 @@
include ../../../gar/gar.lib/auto.mk
include ../../../gar/gar.lib/info.mk
include config.mk
+
+inf:
+ echo $(WORKSRC)
+ echo $(WORKOBJ)
=== modified file 'pkg/gnu/binutils/Makefile'
--- a/pkg/gnu/binutils/Makefile 2022-09-22 21:13:51 +0000
+++ b/pkg/gnu/binutils/Makefile 2022-09-26 04:05:16 +0000
@@ -43,7 +43,7 @@
DISTFILES = $(DISTNAME).tar.lz
SIGFILES = $(DISTFILES).sig
-WORKOBJ = $(WORKDIR)/$(WORKSRC)-build/
+WORKOBJ = $(WORKSRC)-build
INFO_FILES = as.info bfd.info binutils.info gprof.info ld.info
=== modified file 'pkg/gnu/config/Makefile'
--- a/pkg/gnu/config/Makefile 2022-09-22 21:13:51 +0000
+++ b/pkg/gnu/config/Makefile 2022-09-26 04:05:16 +0000
@@ -49,6 +49,7 @@
INSTALL_SCRIPTS = my
WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+WORKOBJ =
# no WORKOBJ in this pkg
######################################################################
=== modified file 'pkg/gnu/fontutils/Makefile'
--- a/pkg/gnu/fontutils/Makefile 2021-06-18 05:32:47 +0000
+++ b/pkg/gnu/fontutils/Makefile 2022-09-26 04:05:16 +0000
@@ -34,7 +34,7 @@
MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES =
-PATCHFILES = $(DISTNAME)-fix-build.diff $(DISTNAME)-add-info-dir-entry.diff
+#PATCHFILES = $(DISTNAME)-fix-build.diff $(DISTNAME)-add-info-dir-entry.diff
#PATCHFILES = gar-base.diff
PATCHOPTS = -p2
INFO_FILES = fontu.info
=== modified file 'pkg/gnu/fontutils/sha256sums'
--- a/pkg/gnu/fontutils/sha256sums 2021-06-18 23:18:34 +0000
+++ b/pkg/gnu/fontutils/sha256sums 2022-09-26 04:05:16 +0000
@@ -1,3 +1,3 @@
75d44bdfc4002238f4ebcba857b913b57ae9e5b356416413f4776f832409939e
download/fontutils-0.7.tar.gz
-2840f70a80ab9aa1038244e5c5f84950cc11bef36e9460cb6fa5da013441a86c
download/fontutils-0.7-fix-build.diff
-743d8bc369abb154cf7c2fe68cd0e4c7789407d49b207007a6b653072cec79bc
download/fontutils-0.7-add-info-dir-entry.diff
+83354811f7c8b8660c40616bd34cbcf41735af9c5090140ebed5baab741da17c
download/fontutils-0.7-fix-build.diff
+eb080f0a9efba9b484b89fc48d2f24704cc3958e3356f0b5feda42228454f38a
download/fontutils-0.7-add-info-dir-entry.diff
=== modified file 'pkg/gnu/linux-libre/Makefile'
--- a/pkg/gnu/linux-libre/Makefile 2022-05-23 16:23:53 +0000
+++ b/pkg/gnu/linux-libre/Makefile 2022-09-26 04:05:16 +0000
@@ -41,6 +41,7 @@
SIGFILES = $(DISTNAME).tar.lz.sign
WORKSRC = $(WORKDIR)/linux-$(GARVER)
+#WORKOBJ = $(WORKSRC)-build
CONFIGURE_SCRIPTS = $(WORKSRC)/Makefile
BUILD_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = kernel
@@ -64,23 +65,23 @@
.PHONY: pre-configure post-configure install-kernel
pre-configure:
- make -C $(WORKSRC) mrproper
+ $(MAKE) -C $(WORKSRC) mrproper
$(MAKECOOKIE)
configure-%/Makefile:
- $(CONFIGURE_ENV) make -C $* $(MAKE_ARGS) $(CONFIGURE_ARGS)
$(CONFIGURE_TARGET)
+ $(CONFIGURE_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(CONFIGURE_ARGS)
$(CONFIGURE_TARGET)
$(MAKECOOKIE)
post-configure:
- cd $(WORKSRC) && make $(MAKE_ARGS) prepare
+ cd $(WORKSRC) && $(MAKE) $(MAKE_ARGS) prepare
$(MAKECOOKIE)
build-%/Makefile:
- $(BUILD_ENV) make -C $* $(BUILD_ARGS)
+ $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS)
$(MAKECOOKIE)
install-kernel:
- make -C $(WORKOBJ) $(MAKE_ARGS) \
+ $(MAKE) -C $(WORKOBJ) $(MAKE_ARGS) \
INSTALL_MOD_PATH=$(packageprefix) \
INSTALL_HDR_PATH=$(packageprefix) \
modules_install \
=== modified file 'pkg/gnu/oleo/Makefile'
--- a/pkg/gnu/oleo/Makefile 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/oleo/Makefile 2022-09-26 04:05:16 +0000
@@ -37,7 +37,7 @@
BUILDDEPS =
-LIBDEPS = ncurses gettext
+LIBDEPS =# ncurses gettext
######################################################################
=== modified file 'pkg/gnu/parallel/gpg-keyring'
Binary files a/pkg/gnu/parallel/gpg-keyring 2022-07-25 20:13:28 +0000 and
b/pkg/gnu/parallel/gpg-keyring 2022-09-26 04:05:16 +0000 differ
=== modified file 'pkg/other/cmake/Makefile'
--- a/pkg/other/cmake/Makefile 2022-09-23 02:45:18 +0000
+++ b/pkg/other/cmake/Makefile 2022-09-26 04:05:16 +0000
@@ -42,8 +42,9 @@
SIGFILES =
#CONFIGURE_SCRIPTS =
-BUILDDEPS =# openssl
+BUILDDEPS = # openssl
LIBDEPS =
+WORK = $(GARNAME)-build
WORKOBJ = $(WORKSRC)-build
######################################################################
@@ -54,7 +55,4 @@
cd $(WORKSRC) && ./bootstrap --prefix=$(prefix)
$(MAKECOOKIE)
-#build: pre-build
-# @echo $(WORKSRC)
-# cd $(WORKSRC) && $(MAKE)
=== modified file 'pkg/other/libtiff/Makefile'
--- a/pkg/other/libtiff/Makefile 2021-10-31 23:13:41 +0000
+++ b/pkg/other/libtiff/Makefile 2022-09-26 04:05:16 +0000
@@ -26,6 +26,7 @@
HOME_URL = http://gitlab.com/libtiff
DESCRIPTION = libtiff
define BLURB
+lib for TIFF image format
endef
LICENSE = MIT license
=== modified file 'pkg/other/stage0/Makefile'
--- a/pkg/other/stage0/Makefile 2020-05-12 17:40:43 +0000
+++ b/pkg/other/stage0/Makefile 2022-09-26 04:05:16 +0000
@@ -44,7 +44,7 @@
BUILDDEPS =
LIBDEPS =
-
+WORKOBJ = $(WORKSRC)
######################################################################
include ../../../gar/gar.lib/auto.mk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r8598: assortment , important build fix,
Carl Hansen <=