gsrc-commit
[Top][All Lists]
Advanced

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

[Gsrc-commit] trunk r8963: some fixes


From: Carl Hansen
Subject: [Gsrc-commit] trunk r8963: some fixes
Date: Thu, 19 Jan 2023 14:52:12 -0500 (EST)
User-agent: Bazaar (2.7.0dev1)

------------------------------------------------------------
revno: 8963
revision-id: carlhansen1234@gmail.com-20230119195206-fevsb5qnh1qbgxg0
parent: carlhansen1234@gmail.com-20230119060704-0iy6zn2ghq1e7c3g
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Thu 2023-01-19 11:52:06 -0800
message:
  some fixes
modified:
  gar/gar.conf.mk                gar.conf.mk-20160617013739-fyi5aiwubjgbbvfn-2
  pkg/freedesktop/harfbuzz/config.mk config.mk-20160617014243-lllvvzo3lukuthtz-1
  pkg/gnu/ncurses/Makefile       makefile-20160617014725-uokjfnggs70iry9h-1464
  setup.sh.in                    setup.sh-20101106152402-ooxzqd6t2mhrnaq2-1
=== modified file 'gar/gar.conf.mk'
--- a/gar/gar.conf.mk   2022-09-27 05:35:42 +0000
+++ b/gar/gar.conf.mk   2023-01-19 19:52:06 +0000
@@ -3,11 +3,15 @@
 GARCHIVEDIR ?= $(GARDIR)/cache/garstow/archives
 GARBALLDIR ?= $(GARDIR)/cache/garstow/garballs
 
-# Flags to pass to make to build in parallel.
+# Flags to pass to "make" to build in parallel.
 # adjust to your machine
+#  eg  
+#  cat /proc/cpuinfo | grep processor | wc -l
+#  or
+#  nproc  # from coreutils
 #MAKE_ARGS_PARALLEL ?= -j1
-MAKE_ARGS_PARALLEL ?= -j5
 #MAKE_ARGS_PARALLEL ?= -j8
+MAKE_ARGS_PARALLEL ?= -j$(shell nproc)
 
 MAKE_ARGS += V=1
 
@@ -16,6 +20,7 @@
 # dependencies by GARStow -- for example, if they're provided by an
 # underlying operating system.
 IGNORE_DEPS ?= libc libiconv binutils
+# hmmm....
 
 # If you want GSRC messages to be printed in color, set USE_COLOR to
 # y. This may help in distinguishing GSRC output from that of the

=== modified file 'pkg/freedesktop/harfbuzz/config.mk'
--- a/pkg/freedesktop/harfbuzz/config.mk        2016-06-17 19:08:15 +0000
+++ b/pkg/freedesktop/harfbuzz/config.mk        2023-01-19 19:52:06 +0000
@@ -1,5 +1,5 @@
 ## Configuration options for harfbuzz ##
 ## adjust as needed
 
-CONFIGURE_OPTS ?= 
+CONFIGURE_OPTS ?=  --with-graphite2=yes
 BUILD_OPTS ?=

=== modified file 'pkg/gnu/ncurses/Makefile'
--- a/pkg/gnu/ncurses/Makefile  2023-01-18 20:47:42 +0000
+++ b/pkg/gnu/ncurses/Makefile  2023-01-19 19:52:06 +0000
@@ -114,6 +114,7 @@
        cd $(WORKSRC)/doc  &&  $(INSTALL_DOCS) hackguide.doc  html/  
ncurses-intro.doc
        $(MAKECOOKIE)
 
+install: install-nonwide install-wide
 
 install-nonwide:  
        @printf "[$(OK)install$(OFF)] $(MSG)Installing ncurses libraries 
$(OFF)\n"
@@ -142,6 +143,7 @@
 #      for lib in ncurses ncurses++ form panel menu; do \
 #              ln -s $(prefix)/lib/pkgconfig/$${lib}w.pc 
$(packageprefix)/lib/pkgconfig/$${lib}.pc; \
 #      done
+#      ??
 #      echo "INPUT(-lncursesw)" >$(packageprefix)/lib/libcursesw.so
 #      ln -s $(prefix)/lib/libncurses.so $(packageprefix)/lib/libcurses.so
 ##     $(MAKECOOKIE)

=== modified file 'setup.sh.in'
--- a/setup.sh.in       2023-01-07 05:46:09 +0000
+++ b/setup.sh.in       2023-01-19 19:52:06 +0000
@@ -1,5 +1,7 @@
+#!/usr/bin/env bash
 # Copyright (C) 2010, 2011 Brian Gough
 # Copyright (C) 2012, 2013 Brandon Invergo <brandon@invergo.net>
+# Copyright (C) 2020, 2023 Carl Hansen
 #
 # This file is part of GSRC.
 #
@@ -61,9 +63,9 @@
 # this to reflect the versions of Python that you have installed on 
 # your system.
 export ORIG_PYTHONPATH=$PYTHONPATH
-#export 
PYTHONPATH=$GSRC/lib/python2.7/site-packages/:$GSRC/lib/python3.11/site-packages:$GSRC/lib64/python3.11/site-packages:$PYTHONPATH}
-# remove python2. adjust as needed
-export 
PYTHONPATH=$GSRC/lib/python3.11/site-packages:$GSRC/lib64/python3.11/site-packages:$PYTHONPATH}
+#export 
PYTHONPATH=$GSRC/lib/python2.7/site-packages/:$GSRC/lib/python3.11/site-packages:$GSRC/lib64/python3.11/site-packages:$PYTHONPATH
+# remove python2. adjust as needed,   check version number on your system
+export 
PYTHONPATH=$GSRC/lib/python3.11/site-packages:$GSRC/lib64/python3.11/site-packages:$PYTHONPATH
 
 # for GNOME programs, this might be needed:
 #                    this might vary on your system:


reply via email to

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