morpheus

suckless linux distro
git clone git://git.2f30.org/morpheus.git
Log | Files | Refs | Submodules | README | LICENSE

commit 817a34ef0b881b1c9a2afac5a9d9fa301e9f6cdf
parent d8f16181cfeb0735a608a96e778516fc7884cc0b
Author: Daniel Bainton <dpb@driftaway.org>
Date:   Mon Mar 10 13:52:48 +0000

Move config.mk to config.def.mk

When using mk, cp config.def.mk to config.mk if it doesn't exist.

Easier to pull changes to the tree, when config.mk doesn't all the time
complain about changes.

Diffstat:
config.def.mk | 20++++++++++++++++++++
config.mk | 20--------------------
mkfile | 1+
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/config.def.mk b/config.def.mk @@ -0,0 +1,20 @@ +#arch = i486 +arch = x86_64 +root = ${top}/root +nprocs = 4 # number of processes for building separate packages +NPROC = 4 # number of processes for mk concurrency + +libcroot = ${root}/opt/cross/${arch}-linux-musl/${arch}-linux-musl +version = 0.0 +mirror = http://dl.2f30.org/morpheus-pkgs/${arch}/${version} +CC = ${arch}-linux-musl-gcc + +# these don't work for all packages yet... +optldflags = -s -Wl,--gc-sections -Wl,-z,relro,-z,now +optcflags = -fdata-sections -ffunction-sections -Os -g0 -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack + +CPPFLAGS = -D_BSD_SOURCE -D_GNU_SOURCE +CFLAGS = -I${libcroot}/include ${CPPFLAGS} # ${optcflags} +LDFLAGS = -L${libcroot}/lib -static ${optldflags} + +PATH = ${root}/opt/cross/${arch}-linux-musl/bin:${PATH} diff --git a/config.mk b/config.mk @@ -1,20 +0,0 @@ -#arch = i486 -arch = x86_64 -root = ${top}/root -nprocs = 4 # number of processes for building separate packages -NPROC = 4 # number of processes for mk concurrency - -libcroot = ${root}/opt/cross/${arch}-linux-musl/${arch}-linux-musl -version = 0.0 -mirror = http://dl.2f30.org/morpheus-pkgs/${arch}/${version} -CC = ${arch}-linux-musl-gcc - -# these don't work for all packages yet... -optldflags = -s -Wl,--gc-sections -Wl,-z,relro,-z,now -optcflags = -fdata-sections -ffunction-sections -Os -g0 -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack - -CPPFLAGS = -D_BSD_SOURCE -D_GNU_SOURCE -CFLAGS = -I${libcroot}/include ${CPPFLAGS} # ${optcflags} -LDFLAGS = -L${libcroot}/lib -static ${optldflags} - -PATH = ${root}/opt/cross/${arch}-linux-musl/bin:${PATH} diff --git a/mkfile b/mkfile @@ -1,4 +1,5 @@ top = `{pwd} +`{ test -e config.mk || cp config.def.mk config.mk } <config.mk allpkgs = `{ls -d pkgs/*}