gsrc-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gsrc-commit] trunk r9095: fix some build/install problem


From: Carl Hansen
Subject: [Gsrc-commit] trunk r9095: fix some build/install problem
Date: Thu, 23 Mar 2023 02:55:06 -0400 (EDT)
User-agent: Bazaar (2.7.0dev1)

------------------------------------------------------------
revno: 9095
revision-id: carlhansen@gnu.org-20230323065501-2lhtjodz9dvstm0n
parent: carlhansen@gnu.org-20230322233916-cqeje7ditz5j80qa
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Wed 2023-03-22 23:55:01 -0700
message:
  fix some build/install problem
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1
  gar/varb.mk                    varb.mk-20221105082844-lv6zntw6y278vjpm-1
=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2023-03-02 02:00:23 +0000
+++ b/gar/gar.lib.mk    2023-03-23 06:55:01 +0000
@@ -1,4 +1,4 @@
-# Standard rules for GARStow ports. aka GSRC
+#e Standard rules for GARStow ports. aka GSRC
 #
 # Copyright (C) 2017-2023 Carl Hansen
 # Copyright (C) 2012, 2013, 2014, 2016 Brandon Invergo
@@ -745,26 +745,27 @@
 prepare-install:
        @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging area 
packageDESTDIR/prefix...$(OFF)\n"
        mkdir -p $(packageDESTDIR)$(prefix)
+       rm -rf $(COOKIEDIR)/install*  $(COOKIEDIR)/sysinstall*
        @set -e; \
-        set -- $(CREATED_MERGE_DIRS); \
-               echo echoing 1 src... $$1 $$src; \
-        while [ "$$1" != "" ]; do \
-            echo echoing 1 2.... 1  $$1 and 2 $$2; \
-            src=$(packagedotgardir)/$$1; \
-            dest=$(packageDESTDIR)$$2; \
-                       echo src $$src ; \
-                       echo dest $$dest ; \
-                       echo  echoing .... mkdir -p $$src `dirname $$dest`; \
-            mkdir -p $$src `dirname $$dest`; \
-            ln -sf $$src $$dest; \
-            shift; shift; \
-        done $(OUTPUT)
+              set -- $(CREATED_MERGE_DIRS); \
+                  echo echoing 1 src... $$1 $$src; \
+              while [ "$$1" != "" ]; do \
+                  echo echoing 1 2.... 1  $$1 and 2 $$2; \
+                  src=$(packagedotgardir)/$$1; \
+                  dest=$(packageDESTDIR)$$2; \
+                     echo src $$src ; \
+                     echo dest $$dest ; \
+                     echo  echoing .... mkdir -p $$src `dirname $$dest`; \
+                  mkdir -p $$src `dirname $$dest`; \
+                  ln -sf $$src $$dest; \
+                  shift; shift; \
+              done $(OUTPUT)
 
 
 #rm -rf $$dest;   
-
 #$(MAKECOOKIE)
 
+# install-something
 
 #carl rm -v $(packageDESTDIR)$$2 $(OUTPUT); \
 #@echo note, before copying.. ls  -Ra
@@ -778,8 +779,8 @@
         set -- $(CREATED_MERGE_DIRS); \
         while [ "$$1" != "" ]; do \
             echo echoing .... finish-package-install to packages t 1  $$1 and 
2 $$2; \
-       #rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
-       #shift; shift; \
+       rmdir -v $(packagedotgardir)/$$1 $(OUTPUT) || true; \
+       shift; shift; \
         done $(OUTPUT)
        @echo packagedir is $(packagedir)
        # carl rm -rvf $(packagedir) $(OUTPUT)
@@ -789,9 +790,7 @@
        @echo end finish-package-install
 
 
-#$(MAKECOOKIE)
 
-       
 
 GNU_INSTALL_ARGS = \
     prefix=$(packageprefix) \
@@ -1138,30 +1137,31 @@
 sysinstall-normalise:
        @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout in packages staging$(OFF)\n"
        @set -e; \
-    normalise () { \
-        rmdir $$1 2>/dev/null || true; \
-        if [ -d $$1 ]; then \
+         normalise () { \
+         rmdir $$1 2>/dev/null || true; \
+         if [ -d $$1 ]; then \
             printf "[$(OK)sysinstall normalise $(OFF)] $(MSG)Moving contents 
of $$1 to $$2$(OFF)\n"; \
             mkdir -p $$2; \
             cp -a $$1/* $$2; \
             rm -fr $$1; \
-        fi; \
-    }; \
-    normalise $(packagedir)/man $(packagedir)/share/man; \
-    normalise $(packagedir)/info $(packagedir)/share/info; \
-    normalise $(packagedir)/doc $(packagedir)/share/doc; \
-    normalise $(packagedir)/examples $(packagedir)/share/doc/examples; \
-    normalise $(packagedir)/games $(packagedir)/bin  $(OUTPUT)
+         fi; \
+          }; \
+          normalise $(packagedir)/man $(packagedir)/share/man; \
+          normalise $(packagedir)/info $(packagedir)/share/info; \
+          normalise $(packagedir)/doc $(packagedir)/share/doc; \
+          normalise $(packagedir)/examples $(packagedir)/share/doc/examples; \
+          normalise $(packagedir)/games $(packagedir)/bin  $(OUTPUT)
        $(MAKECOOKIE)
+
 #examples wrong... FIXME
 
 sysinstall-packagevars:
        @printf "[$(OK)sysinstall-packagevars$(OFF)] $(MSG)Writing package 
metadata FILES DIRS BUILD$(OFF)\n"
        test -d $(dotgardir) || mkdir -p $(dotgardir);
        (cd $(packagedir) \
-       && find . -not -type d -print > $(dotgardir)/FILES \
-       && find . -mindepth 2 -depth -type d -print > $(dotgardir)/DIRS ) \
-        || $(SYSINSTALL_FAIL)
+             && find . -not -type d -print > $(dotgardir)/FILES \
+             && find . -mindepth 2 -depth -type d -print > $(dotgardir)/DIRS ) 
\
+              || $(SYSINSTALL_FAIL)
        cat Makefile $(CHECKSUM_FILE) | sha256sum > $(dotgardir)/BUILD $(OUTPUT)
 
 SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(strip $(GARNAME)) 
$(COOKIEDIR)/sysinstall-*; false)
@@ -1169,7 +1169,7 @@
 sysinstall-install:
        @printf "[$(OK)sysinstall-install$(OFF)] $(MSG)Stowing from packages to 
working directories $(OFF)\n"
        (cp -r -v -f --symbolic-link --target-directory=$(prefix) 
$(packagedir)/* $(OUTPUT) && \
-        ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) || 
$(SYSINSTALL_FAIL) $(OUTPUT)
+            ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) || 
$(SYSINSTALL_FAIL) $(OUTPUT)
 
 sysinstall-uninstall:
        @printf "[$(OK)sysinstall-uninstall$(OFF)] $(MSG)Unstowing from working 
directories $(OFF)\n"

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2023-01-09 20:24:10 +0000
+++ b/gar/gar.mk        2023-03-23 06:55:01 +0000
@@ -88,13 +88,13 @@
 
 # This is to make dirs as needed by the base rules
 $(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKOBJ) $(WORKDIR) 
$(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR) $(DOWNLOADDIRGIT)) :
-       @echo ------ check $@
+       @echo ------ check dir $@
        @if test -d "$@"; then : ; else \
        mkdir -p "$@"; \
      fi
 
 $(COOKIEDIR)/%:
-       @echo ------ check $@
+       @echo ------ check cookie dir $@
        @if test -d "$@"; then : ; else \
         mkdir -p "$@"; \
      fi
@@ -131,9 +131,10 @@
 # ========================= 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
+#     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).
 #
 # Each of these rules has dependencies that run in the following
@@ -204,7 +205,7 @@
 
 # fetch    - Retrieves $(DISTFILES) (and $(PATCHFILES) if defined)
 #    into $(DOWNLOADDIR) as necessary.
-#fetch:        pre-everything custom-pre-everything $(COOKIEDIR) 
$(DOWNLOADDIR) $(DOWNLOADDIRGIT) 
+#fetch:     pre-everything custom-pre-everything $(COOKIEDIR) $(DOWNLOADDIR) 
$(DOWNLOADDIRGIT) 
 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
@@ -215,8 +216,7 @@
 fetch-p:
        $(foreach COOKIEFILE,$(addprefix 
$(COOKIEDIR)/dep-$(GARDIR)/,$(FETCHDEPS)), test -e $(COOKIEFILE) ;)
 
-# checksum    - Use $(CHECKSUMFILE) to ensure that your
-#     distfiles are valid.
+# checksum    - Use $(CHECKSUMFILE) to ensure that your distfiles are valid.
 checksum: fetch pre-checksum custom-pre-checksum $(addprefix 
checksum-,$(filter-out $(NOCHECKSUM),$(ALLFILES))) post-checksum 
custom-post-checksum
        $(DONADA)
 
@@ -375,7 +375,7 @@
 # Update a package: clean out the old stuff, download a new version,
 # rebuild the checksums and install it.
 update:
-       @echo Now going do: clean makesum install
+       @echo Now going to do: clean makesum install
        $(MAKE) clean
        $(MAKE) makesum
        $(MAKE) install

=== modified file 'gar/varb.mk'
--- a/gar/varb.mk       2022-11-09 23:32:01 +0000
+++ b/gar/varb.mk       2023-03-23 06:55:01 +0000
@@ -2,7 +2,9 @@
 inf:
        @echo WORKSRC       $(WORKSRC)
        @echo WORKOBJ       $(WORKOBJ)
-       @echo packagesdir        $(packagesdir)
+       @echo CONFIGURE_ARGS       $(CONFIGURE_ARGS)
+       @echo CONFIGURE_OPTS       $(CONFIGURE_OPTS)
+       @echo packagesdir       $(packagesdir)
        @echo packagedir        $(packagedir)
        @echo dotgardir         $(dotgardir)
        @echo packageDESTDIR    $(packageDESTDIR)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]