artemist/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2019-11-07 13:56:41 +01:00
parent f730841db4 e5bf81256c
commit 0ba8a4e942
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
5 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -1,4 +1,5 @@
makefiles = \ makefiles = \
mk/precompiled-headers.mk \
local.mk \ local.mk \
src/libutil/local.mk \ src/libutil/local.mk \
src/libstore/local.mk \ src/libstore/local.mk \

1
mk/lib.mk
View file

@ -89,7 +89,6 @@ include mk/jars.mk
include mk/patterns.mk include mk/patterns.mk
include mk/templates.mk include mk/templates.mk
include mk/tests.mk include mk/tests.mk
include mk/precompiled-headers.mk
# Include all sub-Makefiles. # Include all sub-Makefiles.

3
perl/Makefile
View file

@ -7,8 +7,9 @@ GLOBAL_CXXFLAGS += -g -Wall
OPTIMIZE = 1 OPTIMIZE = 1
ifeq ($(OPTIMIZE), 1) ifeq ($(OPTIMIZE), 1)
GLOBAL_CFLAGS += -O3
GLOBAL_CXXFLAGS += -O3 GLOBAL_CXXFLAGS += -O3
else
GLOBAL_CXXFLAGS += -O0
endif endif
include mk/lib.mk include mk/lib.mk

14
perl/configure.ac
View file

@ -6,7 +6,6 @@ CFLAGS=
CXXFLAGS= CXXFLAGS=
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11
# Use 64-bit file system calls so that we can support files > 2 GiB. # Use 64-bit file system calls so that we can support files > 2 GiB.
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
@ -69,14 +68,15 @@ AC_SUBST(perlFlags)
PKG_CHECK_MODULES([NIX], [nix-store]) PKG_CHECK_MODULES([NIX], [nix-store])
NEED_PROG([NIX_INSTANTIATE_PROGRAM], [nix-instantiate]) NEED_PROG([NIX], [nix])
# Get nix configure values # Get nix configure values
nixbindir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixBinDir | tr -d \") export NIX_REMOTE=daemon
nixlibexecdir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixLibexecDir | tr -d \") nixbindir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixBinDir)
nixlocalstatedir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixLocalstateDir | tr -d \") nixlibexecdir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixLibexecDir)
nixsysconfdir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixSysconfDir | tr -d \") nixlocalstatedir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixLocalstateDir)
nixstoredir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixStoreDir | tr -d \") nixsysconfdir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixSysconfDir)
nixstoredir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixStoreDir)
AC_SUBST(nixbindir) AC_SUBST(nixbindir)
AC_SUBST(nixlibexecdir) AC_SUBST(nixlibexecdir)
AC_SUBST(nixlocalstatedir) AC_SUBST(nixlocalstatedir)

10
precompiled-headers.h
View file

@ -43,23 +43,13 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <grp.h> #include <grp.h>
#include <net/if.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/ip.h>
#include <pwd.h> #include <pwd.h>
#include <sched.h>
#include <signal.h> #include <signal.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/mount.h>
#include <sys/param.h>
#include <sys/personality.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/syscall.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/utsname.h> #include <sys/utsname.h>