aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/conf/pkgmk.conf2
-rw-r--r--core/conf/prt-get.conf22
-rw-r--r--core/index.html5
-rw-r--r--core/package.html14
-rw-r--r--core/ports.html57
5 files changed, 57 insertions, 43 deletions
diff --git a/core/conf/pkgmk.conf b/core/conf/pkgmk.conf
index 4e4190c..18d8730 100644
--- a/core/conf/pkgmk.conf
+++ b/core/conf/pkgmk.conf
@@ -2,7 +2,7 @@
# /etc/pkgmk.conf: pkgmk(8) configuration
#
-export CFLAGS="-O2 -march=x86-64 -pipe"
+export CFLAGS="-O2 -march=x86-64"
export CXXFLAGS="${CFLAGS}"
export JOBS=$(nproc)
diff --git a/core/conf/prt-get.conf b/core/conf/prt-get.conf
index 1f7a39e..12a24d8 100644
--- a/core/conf/prt-get.conf
+++ b/core/conf/prt-get.conf
@@ -5,28 +5,25 @@
# note: the order matters: the package found first is used
prtdir /usr/ports/core
prtdir /usr/ports/opt
-prtdir /usr/ports/contrib
-prtdir /usr/ports/machine-ports
prtdir /usr/ports/xorg
-# 6c37 team provides a collection with freetype-iu, fontconfig-iu
-# and cairo-iu ports.
-
# the following line enables the multilib compat-32 collection
#prtdir /usr/ports/compat-32
# the following line enables the user maintained contrib collection
-# prtdir /usr/ports/6c37-dropin
-# prtdir /usr/ports/6c37
+prtdir /usr/ports/contrib
+prtdir /usr/ports/ports
+prtdir /usr/ports/mate
+prtdir /usr/ports/kde5
### use mypackage form local directory
# prtdir /home/packages/build:mypackage
### log options:
-writelog enabled # (enabled|disabled)
-logmode overwrite # (append|overwrite)
-rmlog_on_success yes # (no|yes)
-logfile /usr/ports/pkgbuild/%n-%v-%r.log
+# writelog enabled # (enabled|disabled)
+# logmode overwrite # (append|overwrite)
+# rmlog_on_success yes # (no|yes)
+logfile /var/log/pkgbuild/%n.log
# path, %p=path to port dir, %n=port name
# %v=version, %r=release
@@ -37,7 +34,7 @@ logfile /usr/ports/pkgbuild/%n-%v-%r.log
readme verbose # (verbose|compact|disabled)
### prefer higher versions in sysup / diff
-preferhigher no # (yes|no)
+preferhigher yes # (yes|no)
### use regexp search
# useregex no # (yes|no)
@@ -46,7 +43,6 @@ preferhigher no # (yes|no)
### --install-scripts option
runscripts yes # (no|yes)
-
### EXPERT SECTION ###
### alternative commands
diff --git a/core/index.html b/core/index.html
index c9d5d4b..20e50af 100644
--- a/core/index.html
+++ b/core/index.html
@@ -45,16 +45,17 @@
<li><a href="configure.html#locale">1.2.3. Set lacale</a></li>
<li><a href="configure.html#user">1.2.4. Users</a></li>
<li><a href="configure.html#fstab">1.2.5. File system table</a></li>
- <li><a href="configure.html#rcconf">1.2.6. Initialization Scripts</a></li>
+ <li><a href="configure.html#rcconf">1.2.6. Initialization scripts</a></li>
</ul>
</li>
<li><a href="ports.html">1.3. Ports</a>
<ul>
- <li><a href="ports.html#filesystem">1.3.1. Ports Layout</a></li>
+ <li><a href="ports.html#filesystem">1.3.1. Ports layout</a></li>
<li><a href="ports.html#fakeroot">1.3.2. Build as user</a></li>
<li><a href="ports.html#pkgmk">1.3.3. Configure pkgmk</a></li>
<li><a href="ports.html#prtget">1.3.4. Configure prt-get</a></li>
+ <li><a href="ports.html#distcc">1.3.5. Ccache and distcc</a></li>
</ul>
</li>
diff --git a/core/package.html b/core/package.html
index 7d4c8b5..974ead2 100644
--- a/core/package.html
+++ b/core/package.html
@@ -108,7 +108,7 @@
$ sudo pkgadd /usr/ports/packages/git#2.9.3-1.pkg.tar.gz
</pre>
- <p>If you user pkgmk and pkgadd allways check if README, pre and post
+ <p>If you user pkgmk and pkgadd allways check if README, pre and post
instal files exist.</p>
<h3 id="ports">2.3.3. Ports collections</h3>
@@ -132,20 +132,18 @@
prtdir /usr/ports/contrib
# ports described on this documentation
- prtdir /usr/ports/machine-ports
+ prtdir /usr/ports/ports
# 6c37 team provides a collection with freetype-iu, fontconfig-iu
# and cairo-iu ports.
- prtdir /usr/ports/6c37-dropin
- prtdir /usr/ports/6c37
+ # prtdir /usr/ports/6c37-dropin
+ # prtdir /usr/ports/6c37
</pre>
<p>Get new ports;</p>
<pre>
- $ sudo ports -u machine-ports
- $ sudo ports -u 6c37-dropin
- $ sudo ports -u 6c37
+ $ sudo ports -u ports
</pre>
<h2 id="info">2.3.4. Show port information</h2>
@@ -183,7 +181,7 @@
<a href="index.html">Core OS Index</a>
<p>This is part of the Hive System Documentation.
- Copyright (C) 2018
+ Copyright (C) 2019
Hive Team.
See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
for copying conditions.</p>
diff --git a/core/ports.html b/core/ports.html
index e921351..07d52d2 100644
--- a/core/ports.html
+++ b/core/ports.html
@@ -76,10 +76,11 @@
# /etc/pkgmk.conf: pkgmk(8) configuration
#
- export CFLAGS="-O2 -g -march=x86-64 -pipe"
+ export CFLAGS="-O2 -march=x86-64"
export CXXFLAGS="${CFLAGS}"
- # export MAKEFLAGS="-j2"
+ export JOBS=$(nproc)
+ export MAKEFLAGS="-j $JOBS"
case ${PKGMK_ARCH} in
"64"|"")
@@ -96,14 +97,16 @@
;;
esac
- #PKGMK_SOURCE_MIRRORS=(http://machine.example.org/ports/distfiles/)
+ PKGMK_SOURCE_MIRRORS=(https://hive.gnu.systems/mirror/distfiles/)
# PKGMK_SOURCE_DIR="$PWD"
PKGMK_SOURCE_DIR="/usr/ports/distfiles"
# PKGMK_PACKAGE_DIR="$PWD"
PKGMK_PACKAGE_DIR="/usr/ports/packages"
# PKGMK_WORK_DIR="$PWD/work"
- PKGMK_WORK_DIR="/usr/ports/work/$name"
+ PKGMK_WORK_DIR="/usr/ports/work/${name}"
# PKGMK_DOWNLOAD="no"
+ # PKGMK_IGNORE_SIGNATURE="no"
+ # PKGMK_IGNORE_MD5SUM="no"
# PKGMK_IGNORE_FOOTPRINT="no"
# PKGMK_IGNORE_NEW="no"
# PKGMK_NO_STRIP="no"
@@ -136,39 +139,36 @@
# note: the order matters: the package found first is used
prtdir /usr/ports/core
prtdir /usr/ports/opt
- prtdir /usr/ports/contrib
- prtdir /usr/ports/ports
prtdir /usr/ports/xorg
- # 6c37 team provides a collection with freetype-iu, fontconfig-iu
- # and cairo-iu ports.
-
# the following line enables the multilib compat-32 collection
#prtdir /usr/ports/compat-32
# the following line enables the user maintained contrib collection
- # prtdir /usr/ports/6c37-dropin
- # prtdir /usr/ports/6c37
+ prtdir /usr/ports/contrib
+ prtdir /usr/ports/ports
+ prtdir /usr/ports/mate
+ prtdir /usr/ports/kde
### use mypackage form local directory
# prtdir /home/packages/build:mypackage
### log options:
- writelog enabled # (enabled|disabled)
- logmode overwrite # (append|overwrite)
- rmlog_on_success yes # (no|yes)
- logfile /usr/ports/pkgbuild/%n-%v-%r.log
+ # writelog enabled # (enabled|disabled)
+ # logmode overwrite # (append|overwrite)
+ # rmlog_on_success yes # (no|yes)
+ logfile /var/log/pkgbuild/%n.log
# path, %p=path to port dir, %n=port name
# %v=version, %r=release
### use alternate cache file (default: /var/lib/pkg/prt-get.cache
# cachefile /mnt/nfs/cache
- ### print readme information:
+ ### print README information:
readme verbose # (verbose|compact|disabled)
### prefer higher versions in sysup / diff
- preferhigher no # (yes|no)
+ preferhigher yes # (yes|no)
### use regexp search
# useregex no # (yes|no)
@@ -177,16 +177,35 @@
### --install-scripts option
runscripts yes # (no|yes)
-
### expert section ###
### alternative commands
- makecommand sudo -h -u pkgmk fakeroot pkgmk
+ makecommand sudo -H -u pkgmk fakeroot pkgmk
addcommand sudo pkgadd
removecommand sudo pkgrm
runscriptcommand sudo sh
</pre>
+ <h2 id="distcc">1.3.5. Ccache and distcc</h2>
+
+ <p>Ccache avoids same code to be compiled by saving
+ the output from compilers and identifying same
+ input by using hashes and distcc distributes
+ compiling process across machines.</p>
+
+ <p>Don't set native or generic on /etc/pkgmk.conf.</p>
+ <pre>
+ $ prt-get depinst ccache distcc
+ </pre>
+
+ <p>Add to /etc/profile;</p>
+
+ <pre>
+ export PATH="/usr/lib/ccache/:$PATH"
+ export CCACHE_DIR="/var/cache/ccache"
+ export CCACHE_COMPILERCHECK="%compiler% -dumpversion; crux"
+ </pre>
+
<a href="index.html">Core OS Index</a>
<p>
This is part of the Hive System Documentation.