[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r8590: changes to gar.lib.mk changing the way it wor
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r8590: changes to gar.lib.mk changing the way it works, git, other updates |
|
Date: |
Thu, 22 Sep 2022 17:14:03 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 8590
revision-id: carlhansen1234@gmail.com-20220922211351-j8bdrozg7l11ts8f
parent: carlhansen1234@gmail.com-20220922003622-ibybvhzv4hwerq2n
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Thu 2022-09-22 14:13:51 -0700
message:
changes to gar.lib.mk changing the way it works, git, other updates
removed:
pkg/other/taco/files/ files-20220210193309-n8o9n1foqzudjzo4-1
pkg/other/taco/files/getaround-narrowing-warning.diff
getaroundnarrowingwa-20220210193309-n8o9n1foqzudjzo4-2
modified:
gar/gar.lib.mk gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
gar/gar.lib/info.mk info.mk-20160617013740-b2gc1gamt0k7pzjx-7
gar/gar.lib/mesonninja.Nov2018.mk
mesonninja.nov2018.m-20181117072756-syppd0x8sbwu3cz4-1
gar/gar.lib/python.mk python.mk-20160617013740-b2gc1gamt0k7pzjx-9
gar/gar.mk gar.mk-20160617013745-r4h3dj0kiuppihsx-1
pkg/gnu/binutils/Makefile makefile-20160617014725-uokjfnggs70iry9h-456
pkg/gnu/config/Makefile makefile-20170430231231-0lbw966hs16oxlmd-2
pkg/gnu/epsilon/Makefile makefile-20220711205825-36zy9s82dj28g69b-3
pkg/gnu/gnulib/Makefile makefile-20160617014725-uokjfnggs70iry9h-828
pkg/gnu/gsasl/Makefile makefile-20160617014725-uokjfnggs70iry9h-945
pkg/other/cmake/Makefile makefile-20161012192420-6gwv2zkyfuom987t-2
pkg/other/taco/Makefile makefile-20171104211510-tz03d6qot1xo50eo-3
=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk 2022-09-07 17:25:24 +0000
+++ b/gar/gar.lib.mk 2022-09-22 21:13:51 +0000
@@ -66,7 +66,7 @@
@if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
printf "[$(OK)fetch$(OFF)] $(MSG)Grabbing $(OFF)$@\n"; \
for i in $(filter %/$*,$(URLS)); do \
- printf "[$(OK)fetch$(OFF)] $(MSG)Trying $(OFF)$$i\n"; \
+ printf "[$(OK)fetch$(OFF)] $(MSG)Trying ....
$(OFF)$$i\n"; \
$(MAKE) $$i $(OUTPUT) || continue; \
break; \
done; \
@@ -108,15 +108,13 @@
false; \
fi $(OUTPUT)
-# carl FIXME seems this: confused with above, the %
-# link to a local copy of the file
# (relative path)
-## file//%:
-## if test -f $*; then \
-## ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
-## else \
-## false; \
-## fi $(OUTPUT)
+file//%:
+ if test -f $*; then \
+ ln -sf $(CURDIR)/$* $(DOWNLOADDIR)/$(notdir $*); \
+ else \
+ false; \
+ fi $(OUTPUT)
# Using Jeff Waugh's rsync rule.
# DOES NOT PRESERVE SYMLINKS!
@@ -163,14 +161,34 @@
tar -czvf ../$(notdir $*) $(DISTNAME)
# Check out source from Git.
-GIT_REVISION ?= v$(strip $(GARVERSION))
-git//%:
- mkdir -p $(DOWNLOADDIRGIT)
- cd $(DOWNLOADDIRGIT) && \
- git clone $(GIT_PATH) $(DISTNAME) && \
- (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
- tar czvf ../$(notdir $*) $(DISTNAME)
-
+#GIT_REVISION ?= v$(strip $(GARVERSION))
+#git//%:
+# mkdir -p $(DOWNLOADDIRGIT)
+# cd $(DOWNLOADDIRGIT) && \
+# git clone $(GIT_PATH) $(DISTNAME) && \
+# (cd $(DISTNAME) && git checkout $(GIT_REVISION)) && \
+# tar czvf ../$(notdir $*) $(DISTNAME)
+#new
+
+.PHONY: gitpull fetch-git
+#WORKSRC = $(DOWNLOADDIRGIT)/$(GARNAME)
+GIT_REVISION ?= master
+
+gitpull:
+ @printf "git pulling..\n";
+ mkdir -p $(DOWNLOADDIRGIT)/$(GARNAME)
+ (cd $(DOWNLOADDIRGIT)/$(GARNAME) && git pull )
+# don't MAKECOOKIE I think
+
+fetch-git:
+ @if [ -d $(DOWNLOADDIRGIT)/$(GARNAME)/.git ]; then $(MAKE) gitpull ;
else \
+ printf "git cloning and checking out..\n"; \
+ mkdir -p $(DOWNLOADDIRGIT)/$(GARNAME); \
+ cd $(DOWNLOADDIRGIT) && git clone $(GIT_PATH) $(GARNAME) ; \
+ ( cd $(GARNAME) && git checkout $(GIT_REVISION) ) ; fi
+ $(MAKECOOKIE)
+
+#git clone $(GIT_PATH) $(GARNAME) &&
# Check out source from Git with https. , .tar.gz etc
# main purpose is to save the download to DISTNAME rather that github goofy
name
@@ -717,7 +735,7 @@
set -e; \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
- echo 1 $$1 und 2 $$2; \
+ echo echoing 1 $$1 und 2 $$2; \
src=$(packagedotgardir)/$$1; \
dest=$(packageDESTDIR)$$2; \
echo echoing mkdir -p $$src `dirname $$dest`; \
@@ -730,9 +748,10 @@
finish-install:
@printf "[$(OK)finish-install$(OFF)] $(MSG)Moving files from staging
area$(OFF)\n"
- @set -e; \
+ set -e; \
set -- $(CREATED_MERGE_DIRS); \
while [ "$$1" != "" ]; do \
+ echo echoing fininst 1 $$1 and 2 $$2; \
rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
shift; shift; \
@@ -753,19 +772,19 @@
# Use "make install" with prefix-changing.
install-%/Makefile install-%/makefile install-%/GNUmakefile:
- @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*\n"
+ @printf "[$(OK)install in $* $(OFF)] $(MSG)Running make
$(INSTALL_TARGET) in $(OFF)$*\n"
$(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS)
$(INSTALL_TARGET) $(OUTPUT)
$(MAKECOOKIE)
# Use "make install" with DESTDIR.
DESTDIR_INSTALL_ARGS ?=
install-%/Makefile-DESTDIR:
- @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) with
DESTDIR in $(OFF)$*\n"
+ @printf "[$(OK)install with DESTDIR$(OFF)] $(MSG)Running make
$(INSTALL_TARGET) with DESTDIR in $(OFF)$*\n"
$(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(DESTDIR_INSTALL_ARGS)
$(INSTALL_TARGET) DESTDIR=$(packageDESTDIR) $(OUTPUT)
$(MAKECOOKIE)
install-%/Makefile-BSD:
- @printf "[$(OK)install$(OFF)] $(MSG)Running pmake $(INSTALL_TARGET) in
$(OFF)$*\n"
+ @printf "[$(OK)install in $* w pmake$(OFF)] $(MSG)Running pmake
$(INSTALL_TARGET) in $(OFF)$*\n"
cd $* && $(INSTALL_ENV) pmake $(INSTALL_ARGS) $(INSTALL_TARGET)
$(OUTPUT)
$(MAKECOOKIE)
@@ -1071,7 +1090,7 @@
sysinstall-check:
@printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Checking status of DESTDIR
install$(OFF)\n"
- if [ "`ls $(packagedir)`" ]; then \
+ @if [ "`ls $(packagedir)`" ]; then \
printf "[$(OK)sysinstall$(OFF)] $(MSG)Successful DESTDIR
$(packagedir) install$(OFF)\n"; \
else \
printf "[$(ERR)sysinstall$(OFF)] $(MSG)DESTDIR $(packagedir)
install failed, uninstalling$(OFF)\n"; \
=== modified file 'gar/gar.lib/info.mk'
--- a/gar/gar.lib/info.mk 2017-08-01 19:50:31 +0000
+++ b/gar/gar.lib/info.mk 2022-09-22 21:13:51 +0000
@@ -21,17 +21,18 @@
INFO_FILES ?= $(GARNAME).info
post-install:
- printf "[$(OK)install-info$(OFF)] $(MSG)Installing entries to the Info
directory$(OFF)\n"
- if $(SHELL) -c 'install-info --version' >/dev/null; then \
+ @printf "[$(OK)install-info$(OFF)] $(MSG)Installing entries to the Info
directory$(OFF)\n"
+ @if $(SHELL) -c 'install-info --version' >/dev/null; then \
for f in $(INFO_FILES); do \
install-info --debug
--dir-file="$(prefix)/share/info/dir" \
"$(prefix)/share/info/$$f"; \
+ printf "installing $$f\n"; \
done; \
else true; fi
pre-uninstall:
- printf "[$(OK)uninstall-info$(OFF)] $(MSG)Removing entries from the
Info directory$(OFF)\n"
- if $(SHELL) -c 'install-info --version' >/dev/null; then \
+ @printf "[$(OK)uninstall-info$(OFF)] $(MSG)Removing entries from the
Info directory$(OFF)\n"
+ @if $(SHELL) -c 'install-info --version' >/dev/null; then \
for f in $(INFO_FILES); do \
if test -e "$(prefix)/share/info/$$f"; then \
install-info
--dir-file="$(prefix)/share/info/dir" \
=== modified file 'gar/gar.lib/mesonninja.Nov2018.mk'
--- a/gar/gar.lib/mesonninja.Nov2018.mk 2018-11-17 08:23:26 +0000
+++ b/gar/gar.lib/mesonninja.Nov2018.mk 2022-09-22 21:13:51 +0000
@@ -45,7 +45,7 @@
# by meson , due to double destination dir...... arghg
post-configure: configure-mes
@echo find----- a little hairy for make , maybe, but it works
---------------------------
- for fi in `find -name \*.pc`; do \
+ @for fi in `find -name \*.pc`; do \
echo $$fi ; \
sed -i 's*$(packageprefix)*$(prefix)*g' $$fi ; \
done
=== modified file 'gar/gar.lib/python.mk'
--- a/gar/gar.lib/python.mk 2016-06-17 19:08:15 +0000
+++ b/gar/gar.lib/python.mk 2022-09-22 21:13:51 +0000
@@ -22,3 +22,6 @@
INSTALL_SCRIPTS ?= $(WORKOBJ)/setup.py
include ../../../gar/gar.mk
+
+
+#FIXME update ython setuptools or whatever
=== modified file 'gar/gar.mk'
--- a/gar/gar.mk 2022-09-07 17:25:24 +0000
+++ b/gar/gar.mk 2022-09-22 21:13:51 +0000
@@ -21,8 +21,7 @@
else
# No library files to include.
#
-# endif at end of this file
-
+# (endif at end of this file)
# Comment this out to make much verbosity
#.SILENT:
@@ -32,9 +31,11 @@
endef
+BASEDIRABS = $(shell pwd)
GARDIR ?= ../../../gar
GARPKGDIR ?= ../..
PKGGROUPS ?= bio freedesktop gnome gnu gnualpha gnustep gstreamer other xorg
libs tools dev external
+# not all of those exist currently
PKGGROUPDIRS ?= $(foreach GROUP,$(PKGGROUPS),$(GARPKGDIR)/$(GROUP))
GARDIR_ABSOLUTE := $(shell cd $(GARDIR) && pwd)
SCRIPTSDIR = $(GARDIR_ABSOLUTE)/gar.scripts
@@ -57,9 +58,12 @@
# When we use WORKOBJ, we need to know if it's been changed from the default,
# and know how to get back out of it to the port dir.
-WORKOBJ ?= $(WORKSRC)
+# old WORKOBJ ?= $(WORKSRC)
+# cwh
+WORKOBJ ?= $(WORKSRC)-build
WORKOBJ_CHANGED_P = $(filter-out $(WORKSRC),$(WORKOBJ))
LEAVE_WORKOBJ = $(subst $(strip ) ,/,$(patsubst %,..,$(subst /, ,$(WORKOBJ))))
+# note: do I need this?
UPSTREAMNAME ?= $(strip $(GARNAME))
DISTNAME ?= $(UPSTREAMNAME)-$(strip $(GARVERSION))
@@ -124,6 +128,7 @@
# ========================= MAIN RULES =========================
# The main rules are the ones that the user can specify as a
# target on the "make" command-line. Currently, they are:
+# pkg-info pkg-info-curt
# fetch-list fetch checksum makesum keyring extract checkpatch patch
# build install reinstall uninstall package
# (some may not be complete yet).
@@ -196,7 +201,9 @@
# fetch - Retrieves $(DISTFILES) (and $(PATCHFILES) if
defined)
# into $(DOWNLOADDIR) as necessary.
-fetch: pre-everything custom-pre-everything $(COOKIEDIR) $(DOWNLOADDIR)
$(WORKDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-fetch custom-pre-fetch
$(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) post-fetch custom-post-fetch
+fetch: pre-everything custom-pre-everything $(COOKIEDIR) $(DOWNLOADDIR)
$(DOWNLOADDIRGIT) \
+ $(WORKDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-fetch
custom-pre-fetch \
+ $(addprefix $(DOWNLOADDIR)/,$(ALLFILES)) post-fetch
custom-post-fetch
$(DONADA)
# returns true if fetch has completed successfully, false
@@ -361,9 +368,9 @@
# Update a package: clean out the old stuff, download a new version,
# rebuild the checksums and install it.
update:
- echo clean makesums install
+ @echo Now going do: clean makesum install
$(MAKE) clean
- $(MAKE) makesums
+ $(MAKE) makesum
$(MAKE) install
# Install a package only if the source version is not the currently-installed
@@ -405,7 +412,9 @@
# cookie, but that would be lame and unportable).
clean:
@printf "[$(OK)clean$(OFF)] $(MSG)Removing working files and
directories$(OFF)\n"
- rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR)
$(WORKDIR) $(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
+ rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR)
$(WORKDIR) \
+ $(EXTRACTDIR) $(SCRATCHDIR) $(SCRATCHDIR)-$(COOKIEDIR) *~
+
# cwh changed 6-2022 rm --preserve-root=all -rf $(DOWNLOADDIR) $(COOKIEDIR)
$(LOGDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(SCRATCHDIR)
$(SCRATCHDIR)-$(COOKIEDIR) *~
# took out WORKSRC, a subdir of WORK anyway, usually
# could be dangerous....
@@ -458,6 +467,7 @@
#id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E "[0-9A-Z]{8}"` \
+# FIXME
keyring: fetch
id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E
"[0-9A-Z]{8}"` \
&& gpg -v --keyserver keys.gnupg.net --recv-keys $$id &&
gpg -v --export $$id > gpg-keyring
=== modified file 'pkg/gnu/binutils/Makefile'
--- a/pkg/gnu/binutils/Makefile 2022-09-07 17:25:24 +0000
+++ b/pkg/gnu/binutils/Makefile 2022-09-22 21:13:51 +0000
@@ -43,7 +43,7 @@
DISTFILES = $(DISTNAME).tar.lz
SIGFILES = $(DISTFILES).sig
-WORKOBJ = $(WORKDIR)/$(DISTNAME)-build/
+WORKOBJ = $(WORKDIR)/$(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-07 17:25:24 +0000
+++ b/pkg/gnu/config/Makefile 2022-09-22 21:13:51 +0000
@@ -21,7 +21,7 @@
NAME = config
GARNAME = config
-GARVERSION = $(strip 2022-7-25 )
+GARVERSION = $(strip 2022-09)
HOME_URL = http://www.gnu.org/software/config/
DESCRIPTION = config.guess and config.sub scripts
define BLURB
@@ -31,10 +31,10 @@
######################################################################
#https://git.savannah.gnu.org/git/config.git
-MASTER_SITES = https://git.savannah.gnu.org/
-MASTER_SUBDIR = ""
+MASTER_SITES = https://git.savannah.gnu.org
+MASTER_SUBDIR = git
-#GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)$(GARNAME).git
+GIT_PATH = $(MASTER_SITES)/$(MASTER_SUBDIR)/$(GARNAME).git
NOCHECKSUM = $(DISTFILES)
SIGFILES =
@@ -44,7 +44,6 @@
BUILDDEPS = help2man
LIBDEPS =
-#FETCH_SCRIPTS = my
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = my
INSTALL_SCRIPTS = my
@@ -57,39 +56,38 @@
include ../../../gar/gar.mk
include config.mk
-.PHONY: manpages check gitpull fetch-my build-my pre-install install-my
-
-gitpull:
- (cd $(WORKSRC) && git pull)
-
-fetch-my:
- if [ -d $(WORKSRC)/.git ]; then $(MAKE) gitpull ; else \
- (cd $(DOWNLOADDIRGIT) && \
- git clone https://git.savannah.gnu.org/git/$(GARNAME).git) ; \
- ( cd $(WORKSRC) && git checkout $(GIT_REVISION) ;)
- fi
- $(MAKECOOKIE)
-
+.PHONY: manpages check gitpull fetch-git build-my pre-install install-my
+
# needs help2man for manpages
-manpages:
+manpages: build-my
make -C $(WORKSRC) manpages
-check:
+
+check: build-my
make -C $(WORKSRC) check
-build-my: fetch-my manpages check
+build-my: fetch-git
+ @echo recommended: make check
$(MAKECOOKIE)
-pre-install:
- mkdir -p $(prefix)/packages/$(GARNAME)-$(GARVERSION)/bin
+
+pre-install: fetch-git
+ mkdir -p $(packagesdir)/$(DISTNAME)
+ @echo prepare-install
+ $(MAKE) prepare-install
@echo INSTALL_BIN $(WORKSRC)/config/config.guess and config.sub
$(INSTALL_BIN) $(WORKSRC)/config.guess
$(INSTALL_BIN) $(WORKSRC)/config.sub
$(INSTALL_MAN) $(WORKSRC)/doc/config.guess.1
$(INSTALL_MAN) $(WORKSRC)/doc/config.sub.1
-
-
-install-my: pre-install
+ $(MAKECOOKIE)
+
+#install-my: pre-install
+# $(MAKE) finish-install
+# $(MAKECOOKIE)
+
+#pre-sysinstall: finish-install
+#echo sysinstall
=== modified file 'pkg/gnu/epsilon/Makefile'
--- a/pkg/gnu/epsilon/Makefile 2022-08-11 17:43:18 +0000
+++ b/pkg/gnu/epsilon/Makefile 2022-09-22 21:13:51 +0000
@@ -54,24 +54,24 @@
include config.mk
-.PHONY: fetch-my
-
-
-
-gitpull:
- (cd $(WORKSRC) && git pull)
-
-fetch-my:
- @echo gitting it
- if [ -d $(WORKSRC)/.git ]; then $(MAKE) gitpull ; else \
- cd $(DOWNLOADDIRGIT) && git clone
https://git.savannah.gnu.org/git/$(GARNAME).git ; \
- cd $(GARNAME) && git checkout $(GIT_REVISION) ; fi
- $(MAKECOOKIE)
+.PHONY: fetch-git
+
+
+
+#gitpull:
+# (cd $(WORKSRC) && git pull)
+#
+#fetch-my:
+# @echo gitting it
+# if [ -d $(WORKSRC)/.git ]; then $(MAKE) gitpull ; else \
+# cd $(DOWNLOADDIRGIT) && git clone
https://git.savannah.gnu.org/git/$(GARNAME).git ; \
+# cd $(GARNAME) && git checkout $(GIT_REVISION) ; fi
+# $(MAKECOOKIE)
#git clone $(GIT_PATH) $(GARNAME) &&
-pre-configure: fetch-my
+pre-configure: fetch-git
cd $(WORKSRC) && ./autogen.sh
$(MAKECOOKIE)
=== modified file 'pkg/gnu/gnulib/Makefile'
--- a/pkg/gnu/gnulib/Makefile 2022-09-05 15:45:13 +0000
+++ b/pkg/gnu/gnulib/Makefile 2022-09-22 21:13:51 +0000
@@ -39,8 +39,8 @@
######################################################################
CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS = gl
-INSTALL_SCRIPTS = gl
+BUILD_SCRIPTS = gl
+INSTALL_SCRIPTS = gl
NOCHECKSUM = $(DISTFILES)
@@ -66,22 +66,22 @@
.PHONY: gitpull fetch-my makedoc build-gl install-gl
build-gl:
- $(MAKE) fetch-my
+ $(MAKE) fetch-git
$(MAKE) makedoc
$(MAKECOOKIE)
-gitpull:
- (cd $(WORKSRC) && git pull )
-
-fetch-my::
- if [ -d $(WORKSRC)/.git ]; then $(MAKE) gitpull ; else \
- cd $(DOWNLOADDIRGIT) && git clone
https://git.savannah.gnu.org/git/$(GARNAME).git ; \
- cd $(GARNAME) && git checkout $(GIT_REVISION) ; fi
- $(MAKECOOKIE)
+#gitpull:
+# (cd $(WORKSRC) && git pull )
+#
+#fetch-git::
+# if [ -d $(WORKSRC)/.git ]; then $(MAKE) gitpull ; else \
+# cd $(DOWNLOADDIRGIT) && git clone
https://git.savannah.gnu.org/git/$(GARNAME).git ; \
+# cd $(GARNAME) && git checkout $(GIT_REVISION) ; fi
+# $(MAKECOOKIE)
makedoc: fetch-my
- make -C $(WORKSRC)/doc/
+ $(MAKE) -C $(WORKSRC)/doc/
$(MAKECOOKIE)
=== modified file 'pkg/gnu/gsasl/Makefile'
--- a/pkg/gnu/gsasl/Makefile 2022-09-03 17:57:23 +0000
+++ b/pkg/gnu/gsasl/Makefile 2022-09-22 21:13:51 +0000
@@ -20,7 +20,7 @@
#
# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
-NAME = SASL
+NAME = GNU SASL
GARNAME = gsasl
GARVERSION = 2.2.0
HOME_URL = http://www.gnu.org/software/gsasl/
@@ -48,3 +48,4 @@
include ../../../gar/gar.lib/auto.mk
include ../../../gar/gar.lib/info.mk
include config.mk
+
=== modified file 'pkg/other/cmake/Makefile'
--- a/pkg/other/cmake/Makefile 2022-08-22 14:59:00 +0000
+++ b/pkg/other/cmake/Makefile 2022-09-22 21:13:51 +0000
@@ -42,7 +42,7 @@
SIGFILES =
CONFIGURE_SCRIPTS =
-BUILDDEPS = openssl
+BUILDDEPS =# openssl
LIBDEPS =
######################################################################
=== modified file 'pkg/other/taco/Makefile'
--- a/pkg/other/taco/Makefile 2022-08-30 21:36:18 +0000
+++ b/pkg/other/taco/Makefile 2022-09-22 21:13:51 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2017, 2018, 2019 Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2017, 2018, 2019, 2022 Carl Hansen <carlhansen@gnu.org>
#
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -20,7 +20,7 @@
# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
#
-NAME = Tensor Compiler, taco
+NAME = Tensor Algebra Compiler, taco
GARNAME = taco
GARVERSION = master
HOME_URL = http://tensor-compiler.org/
@@ -34,39 +34,31 @@
######################################################################
-.PHONY: manpages check gitpull fetch-my build-my pre-install install-my
-
-MASTER_SITES = $(MASTER_GITHUB)
-MASTER_SUBDIR = tensor-compiler/
-
-gitpull:
- (cd $(PWD)/$(WORKSRC) && git pull)
-
-fetch-my:
- if [ -d $(PWD)/$(WORKSRC)/.git ]; then $(MAKE) gitpull ; else \
- (cd $(DOWNLOADDIRGIT) && git clone $(MASTER_GITHUB)/$(GARNAME).git)
; \
- fi
- $(MAKECOOKIE)
-
-
-
-#-=--------------------
-
-# GIT_PATH = $(MASTER_SITES)$(MASTER_SUBDIR)$(GARNAME).git
+.PHONY: manpages check gitpull fetch-git build-it pre-install install-my
+
+MASTER_SITES = https://github.com
+#MASTER_SITES = $(MASTER_GITHUB)
+MASTER_SUBDIR = tensor-compiler
+GIT_PATH = $(MASTER_SITES)/$(MASTER_SUBDIR)/$(GARNAME).git
#https://github.com/tensor-compiler/taco.git
-#DISTNAME = $(GARNAME)-$(GARVERSION)
-#DISTFILES = $(DISTNAME).tar.gz
+
NOCHECKSUM = $(DISTFILES)
SIGFILES =
GIT_REVISION = master
-PATCHFILES = getaround-narrowing-warning.diff
-WORKSRC = $(WORKDIR)/$(DISTNAME)/
-CONFIGURE_SCRIPTS = $(WORKDIR)/$(DISTNAME)/CMakeLists.txt
+#PATCHFILES = getaround-narrowing-warning.diff
+GITSRC = $(BASEDIRABS)/$(GARNAME)/$(DOWNLOADDIRGIT)/$(GARNAME)
+WORKOBJ = $(GITSRC)
+#WORKOBJ = $(WORKDIR)/taco-master
+
+#CONFIGURE_SCRIPTS = $(WORKDIR)/$(DISTNAME)/CMakeLists.txt
BUILDDEPS =
LIBDEPS =
+BUILD_SCRIPTS = it
+
+
# HINT: add #include <limits.h> to pack.h , if needed.
# HINT: multiprocessor library support, see READMEs.
# apparent libiconv problem....
@@ -76,3 +68,31 @@
include ../../../gar/gar.lib/cmake.mk
include config.mk
+info:
+ @echo PWD $(PWD)
+ @echo GITSRC $(GITSRC)
+ @echo WORKOBJ $(WORKOBJ)
+ cd $(BASEDIRABS)/download && pwd
+
+pre-fetch:
+ mkdir -p $(WORKSRC)
+ $(MAKECOOKIE)
+
+post-fetch:
+ $(MAKE) fetch-git
+
+#pre-build: fetch-git
+# @echo fetching with git
+# mkdir -p $(WORKOBJ)
+# ls -l $(WORKOBJ)
+#
+#
+#build-it: pre-build
+# cmake --build $(GITSRC)
+#
+
+
+#cmake -S $(GITSRC) -B $(WORKOBJ)
+
+
+
=== removed directory 'pkg/other/taco/files'
=== removed file 'pkg/other/taco/files/getaround-narrowing-warning.diff'
--- a/pkg/other/taco/files/getaround-narrowing-warning.diff 2022-02-10
19:33:24 +0000
+++ b/pkg/other/taco/files/getaround-narrowing-warning.diff 1970-01-01
00:00:00 +0000
@@ -1,25 +0,0 @@
-diff -x config.log -x config.status -ru tmp/taco-master/.git/config
work/taco-master/.git/config
---- tmp/taco-master/.git/config 2022-02-08 17:09:49.000000000 -0800
-+++ work/taco-master/.git/config 2022-02-10 11:17:28.437269109 -0800
-@@ -9,3 +9,9 @@
- [branch "master"]
- remote = origin
- merge = refs/heads/master
-+[submodule "python_bindings/pybind11"]
-+ active = true
-+ url = https://github.com/pybind/pybind11
-+[submodule "test/bats"]
-+ active = true
-+ url = https://github.com/bats-core/bats-core
-diff -x config.log -x config.status -ru
tmp/taco-master/test/tests-tensor_types.cpp
work/taco-master/test/tests-tensor_types.cpp
---- tmp/taco-master/test/tests-tensor_types.cpp 2022-02-08
17:09:49.000000000 -0800
-+++ work/taco-master/test/tests-tensor_types.cpp 2022-02-10
11:27:19.870965999 -0800
-@@ -45,7 +45,7 @@
- ASSERT_EQ(t, a.getComponentType());
- ASSERT_EQ(1, a.getOrder());
- ASSERT_EQ(5, a.getDimension(0));
-- map<vector<int>,TypeParam> vals = {{{0}, 1.0}, {{2}, 2.0}};
-+ map<vector<int>,TypeParam> vals = {{{0}, 1}, {{2}, 2}};
- for (auto& val : vals) {
- a.insert(val.first, val.second);
- }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r8590: changes to gar.lib.mk changing the way it works, git, other updates,
Carl Hansen <=