[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r10847: bunch of minor fixes
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r10847: bunch of minor fixes |
|
Date: |
Tue, 19 Nov 2024 14:48:58 -0500 (EST) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 10847
revision-id: carlhansen@gnu.org-20241119194849-d2n7q4jtbpw2uikg
parent: carlhansen@gnu.org-20241119192717-952ccs21txpon06r
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Tue 2024-11-19 19:48:49 +0000
message:
bunch of minor fixes
modified:
pkg/gnome/simple-scan/config.mk config.mk-20161016061119-o83dath88irwqg31-2
pkg/gnu/gcc7/config.mk config.mk-20160617015453-ksaie5ols1c2eidw-1
pkg/gnu/ggradebook/Makefile makefile-20160617014725-uokjfnggs70iry9h-714
pkg/gnu/gnustandards/Makefile makefile-20160617014725-uokjfnggs70iry9h-895
pkg/gnu/goptical/Makefile makefile-20160617014725-uokjfnggs70iry9h-904
pkg/gnu/linux-libre/Makefile makefile-20160617014725-uokjfnggs70iry9h-1266
pkg/gnu/linux-libre/config.mk config.mk-20160617020538-29xji6acl34g7ouf-1
pkg/gnu/linux-libre/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-1271
pkg/gnu/mit-scheme/Makefile makefile-20160617014725-uokjfnggs70iry9h-1396
pkg/gnu/mit-scheme/config.mk config.mk-20160617020720-m8c1hphejgj4swsk-1
pkg/gnu/solfege-alpha/Makefile makefile-20160617014725-uokjfnggs70iry9h-1770
pkg/gnu/solfege/Makefile makefile-20180327023553-t40mm0bmq04u09t6-4
pkg/gnu/xlogmaster/Makefile makefile-20160617014725-uokjfnggs70iry9h-2023
pkg/gnu/xlogmaster/config.mk config.mk-20160617021515-jm4d4qb9kkqj9610-1
pkg/gnustep/gnumail/config.mk config.mk-20160617021724-waptzg6ikmwt929f-1
pkg/gnustep/pantomime/config.mk config.mk-20160617021807-5yayisnmpdyo1pyc-1
pkg/other/freetype/config.mk config.mk-20180212014529-x1e0632ts1xqt9at-2
pkg/other/freeverb3/config.mk config.mk-20180530185531-034edw9wsztx7hot-2
=== modified file 'pkg/gnome/simple-scan/config.mk'
--- a/pkg/gnome/simple-scan/config.mk 2019-12-19 00:23:00 +0000
+++ b/pkg/gnome/simple-scan/config.mk 2024-11-19 19:48:49 +0000
@@ -2,4 +2,4 @@
## adjust as needed
CONFIGURE_OPTS ?= -U HAVE_COLORD -U HAVE_PACKAGEKIT -U HAVE_WEBP
-BUILD_OPTS ?= -U HAVE_COLORD -U HAVE_PACKAGEKIT -U HAVE_WEBP
+BUILD_OPTS ?=
=== modified file 'pkg/gnu/gcc7/config.mk'
--- a/pkg/gnu/gcc7/config.mk 2019-06-10 18:36:29 +0000
+++ b/pkg/gnu/gcc7/config.mk 2024-11-19 19:48:49 +0000
@@ -72,6 +72,5 @@
# of building when not using recent gcc to build.
-BUILD_OPTS ?= -Wall -Wextra
=== modified file 'pkg/gnu/ggradebook/Makefile'
--- a/pkg/gnu/ggradebook/Makefile 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/ggradebook/Makefile 2024-11-19 19:48:49 +0000
@@ -35,7 +35,7 @@
WORKSRC = $(WORKDIR)/Ggradebook-$(GARVERSION)/
BUILDDEPS =
-LIBDEPS = gtk1
+LIBDEPS =# gtk1
######################################################################
@@ -45,4 +45,4 @@
CONFIGURE_ARGS += --with-gtk-prefix=$(prefix) \
--with-gtk-exec-prefix=$(prefix) \
-BUILD_ARGS += GTK_CFLAGS="-I$(prefix)/include/" GTK_LIBS="-L$(prefix)/lib/"
+BUILD_ARGS += "GTK_CFLAGS=-I$(prefix)/include/ GTK_LIBS=-L$(prefix)/lib/"
=== modified file 'pkg/gnu/gnustandards/Makefile'
--- a/pkg/gnu/gnustandards/Makefile 2024-10-30 21:58:52 +0000
+++ b/pkg/gnu/gnustandards/Makefile 2024-11-19 19:48:49 +0000
@@ -29,7 +29,7 @@
endef
######################################################################
-# https://www.gnu.org/prep/standards/standards.info.tar.gz
+#https://www.gnu.org/prep/standards/standards.info.tar.gz
#https://www.gnu.org/prep/standards/standards.texi.tar.gz
#https://www.gnu.org/prep/maintain/maintain.texi.tar.gz
# not in mirrors:
=== modified file 'pkg/gnu/goptical/Makefile'
--- a/pkg/gnu/goptical/Makefile 2023-12-04 03:26:07 +0000
+++ b/pkg/gnu/goptical/Makefile 2024-11-19 19:48:49 +0000
@@ -44,7 +44,6 @@
LIBDEPS = #gsl
WORKSRC = download-hg/goptical
WORKOBJ = $(WORKDIR)/goptical.build
-#BUILD_ARGS = -I$(WORKSRC)/src -I$(WORKSRC)/src/goptical-design/src
-I$(WORKSRC)/src/goptical-core/src
######################################################################
@@ -52,6 +51,7 @@
include ../../../gar/gar.lib/info.mk
include config.mk
+BUILD_ARGS = CFLAGS+="-I$(WORKSRC)/src -I$(WORKSRC)/src/goptical-design/src
-I$(WORKSRC)/src/goptical-core/src ./"
fetch: fetchit
=== modified file 'pkg/gnu/linux-libre/Makefile'
--- a/pkg/gnu/linux-libre/Makefile 2024-09-16 21:32:56 +0000
+++ b/pkg/gnu/linux-libre/Makefile 2024-11-19 19:48:49 +0000
@@ -21,7 +21,7 @@
NAME = Linux Libre kernel
GARNAME = linux-libre
-GARVER = 6.11
+GARVER = 6.12
GARVERSION = $(GARVER)-gnu
HOME_URL = http://www.gnu.org/software/linux-libre
# http://linux-libre.fsfla.org/pub/linux-libre/releases/
@@ -35,13 +35,13 @@
#http://linux-libre.fsfla.org/pub/linux-libre/releases/6.9-gnu/linux-libre-6.9-gnu.tar.lz
MASTER_SITES = http://linux-libre.fsfla.org/
MASTER_SUBDIR = pub/$(GARNAME)/releases/$(GARVERSION)/
-#PATCHFILE_SITES = $(MASTER_SITES)
-#PATCHFILE_SUBDIR = $(MASTER_SUBDIR)/erratum-a/
SIGFILE_SITES = $(MASTER_SITES)
SIGFILE_SUBDIR = $(PATCHFILE_SUBDIR)
-#`PATCHFILES = scripts-6.10-gnu-6.10-gnua.patch
sources-6.10-gnu-6.10-gnua.patch
-#`PATCHOPTS = -p5
+# PATCHFILE_SITES = $(MASTER_SITES)
+# PATCHFILE_SUBDIR = $(MASTER_SUBDIR)/erratum-a/
+# PATCHFILES = scripts-6.10-gnu-6.10-gnua.patch
sources-6.10-gnu-6.10-gnua.patch
+# PATCHOPTS = -p5
DISTFILES = $(DISTNAME).tar.lz
SIGFILES = $(DISTNAME).tar.lz.sign
@@ -54,18 +54,19 @@
# sources-6.10-gnu-6.10-gnua.patch.sign 2024-07-15 12:02 195
WORKSRC = $(WORKDIR)/linux-$(GARVER)
-WORKOBJ = $(WORKDIR)/linux-$(GARVER)-build
+WORKOBJ = $(WORKDIR)/linux-$(GARVERSION)-build
-CONFIGURE_SCRIPTS = $(WORKSRC)/Makefile
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = kernel
+#CONFIGURE_SCRIPTS = $(WORKSRC)/Makefile
+CONFIGURE_SCRIPTS =
+#BUILD_SCRIPTS = $(WORKSRC)/Makefile
+#INSTALL_SCRIPTS = kernel
BUILDDEPS =
LIBDEPS =
######################################################################
include ../../../gar/gar.lib/autotools.mk
-#include ../../../gar/gar.lib/info.mk
+include ../../../gar/gar.lib/info.mk
include ../../../gar/varb.mk
include config.mk
@@ -78,11 +79,11 @@
# Which method for configuring? i.e. xconfig, menuconfig, oldconfig, etc.
CONFIGURE_TARGET ?= menuconfig
-# Define whatever options you want to send to the Makefile for configuring
-CONFIGURE_OPTS ?= CONFIG_DEBUG_INFO_BTF=0
+# Define whatever options you want to send to 'configure' for configuring
+#CONFIGURE_ARGS ?= CONFIG_DEBUG_INFO_BTF=0
# Define whatever options you want to send to the Makefile for building
-BUILD_OPTS += $(if $(USE_PARALLEL),$(MAKE_ARGS_PARALLEL),)
+BUILD_ARGS += $(if $(USE_PARALLEL),$(MAKE_ARGS_PARALLEL),)
CREATED_MERGE_DIRS = \
sysconf $(sysconfdir) \
@@ -92,16 +93,18 @@
.PHONY: pre-configure post-configure install-kernel
pre-configure:
- $(MAKE) -C $(WORKSRC) mrproper
- $(MAKECOOKIE)
-
-configure-%/Makefile:
- $(CONFIGURE_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(CONFIGURE_ARGS)
$(CONFIGURE_TARGET)
- $(MAKECOOKIE)
-
-post-configure:
- cd $(WORKSRC) && $(MAKE) $(MAKE_ARGS) prepare
- $(MAKECOOKIE)
+ mkdir -p $(WORKSRC) $(WORKOBJ)
+ $(MAKE) -C $(WORKSRC) mrproper
+ $(MAKE) -C $(WORKSRC) $(CONFIGURE_TARGET)
+ $(MAKECOOKIE)
+
+#configure-%/Makefile:
+# $(CONFIGURE_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(CONFIGURE_ARGS)
$(CONFIGURE_TARGET)
+# $(MAKECOOKIE)
+
+#post-configure:
+# cd $(WORKSRC) && $(MAKE) prepare
+# $(MAKECOOKIE)
build-%/Makefile:
$(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS)
=== modified file 'pkg/gnu/linux-libre/config.mk'
--- a/pkg/gnu/linux-libre/config.mk 2024-03-11 20:56:59 +0000
+++ b/pkg/gnu/linux-libre/config.mk 2024-11-19 19:48:49 +0000
@@ -1,9 +1,9 @@
## Configuration options for linux-libre ##
-# Define whatever options you want to send to the Makefile for configuring
+# Define whatever options you want to send to 'configure' for configuring
CONFIGURE_OPTS ?=
-# Define whatever options you want to send to the Makefile for building
+# Define whatever options you want to send to the 'make' command for building
BUILD_OPTS ?=
=== modified file 'pkg/gnu/linux-libre/sha256sums'
--- a/pkg/gnu/linux-libre/sha256sums 2024-09-16 21:32:56 +0000
+++ b/pkg/gnu/linux-libre/sha256sums 2024-11-19 19:48:49 +0000
@@ -1,2 +1,2 @@
-e77016caac51b9d26721689c2f58ae945171bccaa97a98623661c3f826e6068d
download/linux-libre-6.11-gnu.tar.lz
-bb1f031feb3a4bc621e482a0df279fdb1bab7a16704ef8b2b21520a7cad2cadd
download/linux-libre-6.11-gnu.tar.lz.sign
+8ca6702084d352b1f856aa4dbf14706e2432136c6c64395628f0185d899658c7
download/linux-libre-6.12-gnu.tar.lz
+51d5c93ee35454574fa10a36b3e3ed651880661d4a93ed8e4de20ca0fdb55640
download/linux-libre-6.12-gnu.tar.lz.sign
=== modified file 'pkg/gnu/mit-scheme/Makefile'
--- a/pkg/gnu/mit-scheme/Makefile 2023-01-26 00:02:07 +0000
+++ b/pkg/gnu/mit-scheme/Makefile 2024-11-19 19:48:49 +0000
@@ -38,12 +38,16 @@
MASTER_SITES = $(MASTER_GNU)
MASTER_SUBDIR = $(GARNAME)/stable.pkg/$(GARVERSION)/
#arch = $(subst _,-,$(GARARCH))
-#DISTFILES = $(DISTNAME)-$(arch).tar.gz
-#SIGFILES = $(DISTNAME)-$(arch).tar.gz.sig
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure $(WORKSRC)/doc/configure
-BUILD_SCRIPTS = $(WORKSRC)/src/Makefile
+
+
+WORKSRC = $(WORKDIR)/$(DISTNAME)/src
+#WORKOBJ = $(WORKDIR)/$(DISTNAME)-build
+WORKOBJ = $(WORKSRC)
+
+CONFIGURE_SCRIPTS = me
+#BUILD_SCRIPTS = $(WORKSRC)/src/Makefile
#INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile
BUILDDEPS = ncurses
@@ -64,13 +68,19 @@
# // extern char * tparam (const char *, char *, int, ...);
# ^^^^^^^
#
-# and all will be well
-#
-# except for the fact it doesn't compile
+# and all will be well, except for the fact it doesn't compile
######################################################################
-#include ../../../gar/gar.mk
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include ../../../gar/gar.lib/info.mk
include config.mk
+
+
+configure-me:
+ cd $(WORKSRC) && ./configure
+ cd $(WORKSRC)/../doc && ./configure
+ $(MAKECOOKIE)
+
+
+
=== modified file 'pkg/gnu/mit-scheme/config.mk'
--- a/pkg/gnu/mit-scheme/config.mk 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/mit-scheme/config.mk 2024-11-19 19:48:49 +0000
@@ -1,4 +1,5 @@
## Configuration options for mit-scheme ##
CONFIGURE_OPTS ?= --with-x --enable-native-code
-BUILD_OPTS ?= compile-microcode
+BUILD_OPTS ?=
+#compile-microcode
=== modified file 'pkg/gnu/solfege-alpha/Makefile'
--- a/pkg/gnu/solfege-alpha/Makefile 2020-08-15 22:14:49 +0000
+++ b/pkg/gnu/solfege-alpha/Makefile 2024-11-19 19:48:49 +0000
@@ -45,5 +45,5 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
=== modified file 'pkg/gnu/solfege/Makefile'
--- a/pkg/gnu/solfege/Makefile 2018-03-27 02:40:20 +0000
+++ b/pkg/gnu/solfege/Makefile 2024-11-19 19:48:49 +0000
@@ -45,5 +45,6 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
+
=== modified file 'pkg/gnu/xlogmaster/Makefile'
--- a/pkg/gnu/xlogmaster/Makefile 2024-03-31 22:53:13 +0000
+++ b/pkg/gnu/xlogmaster/Makefile 2024-11-19 19:48:49 +0000
@@ -43,8 +43,6 @@
include config.mk
-CFLAGS+=-fpermissive
-CXXFLAGS+=-fpermissive
-CPATH=$(prefix)/include/glib-2.0/
+BUILD_ARGS = "CFLAGS+=-fpermissive CXXFLAGS+=-fpermissive
CPATH+=$(prefix)/include/glib-2.0/"
=== modified file 'pkg/gnu/xlogmaster/config.mk'
--- a/pkg/gnu/xlogmaster/config.mk 2022-03-27 02:38:39 +0000
+++ b/pkg/gnu/xlogmaster/config.mk 2024-11-19 19:48:49 +0000
@@ -1,4 +1,4 @@
## Configuration options for xlogmaster ##
CONFIGURE_OPTS ?= --disable-gtktest
-BUILD_OPTS ?= -I$(prefix)/include/pango-1.0/ CXXFLAGS=-fpermissive
+BUILD_OPTS ?= CFLAGS+="-I$(prefix)/include/pango-1.0/ CXXFLAGS=-fpermissive"
=== modified file 'pkg/gnustep/gnumail/config.mk'
--- a/pkg/gnustep/gnumail/config.mk 2024-11-09 02:58:01 +0000
+++ b/pkg/gnustep/gnumail/config.mk 2024-11-19 19:48:49 +0000
@@ -6,4 +6,4 @@
BUILD_OPTS ?=
# might be needed:
-#BUILD_OPTS ?= -Wl,"-L/opt/gsrc/lib -liconv"
+#BUILD_OPTS ?= CFLAGS="-Wl,-L/opt/gsrc/lib -liconv"
=== modified file 'pkg/gnustep/pantomime/config.mk'
--- a/pkg/gnustep/pantomime/config.mk 2017-08-29 05:50:17 +0000
+++ b/pkg/gnustep/pantomime/config.mk 2024-11-19 19:48:49 +0000
@@ -6,4 +6,4 @@
#BUILD_OPTS ?=
# might be needed:
-BUILD_OPTS ?= -Wl,"-L/opt/gsrc/lib -liconv"
+BUILD_OPTS ?= LDFLAGS="-Wl,-L/opt/gsrc/lib -liconv"
=== modified file 'pkg/other/freetype/config.mk'
--- a/pkg/other/freetype/config.mk 2024-03-08 19:27:57 +0000
+++ b/pkg/other/freetype/config.mk 2024-11-19 19:48:49 +0000
@@ -3,4 +3,3 @@
CONFIGURE_OPTS ?=
BUILD_OPTS ?=
-#BUILD_OPTS ?= -Wl,-r -Wl,-fPIC
=== modified file 'pkg/other/freeverb3/config.mk'
--- a/pkg/other/freeverb3/config.mk 2018-05-30 18:56:13 +0000
+++ b/pkg/other/freeverb3/config.mk 2024-11-19 19:48:49 +0000
@@ -2,4 +2,4 @@
## adjust as needed
CONFIGURE_OPTS ?=
-BUILD_OPTS ?= -Wl,-r -Wl,-fPIC
+BUILD_OPTS ?= CFLAGS+="-Wl,-r -Wl,-fPIC"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r10847: bunch of minor fixes,
Carl Hansen <=