Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6d2605500fd9
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e5bf81256c8a
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 7, 2019

  1. Fix Perl bindings

    @edolstra
    edolstra committed Nov 7, 2019
    Copy the full SHA
    e5bf812 View commit details
Showing with 10 additions and 9 deletions.
  1. +1 −0 Makefile
  2. +0 −1 mk/lib.mk
  3. +2 −1 perl/Makefile
  4. +7 −7 perl/configure.ac
1 change: 1 addition & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
makefiles = \
mk/precompiled-headers.mk \
local.mk \
src/libutil/local.mk \
src/libstore/local.mk \
1 change: 0 additions & 1 deletion mk/lib.mk
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,6 @@ include mk/jars.mk
include mk/patterns.mk
include mk/templates.mk
include mk/tests.mk
include mk/precompiled-headers.mk


# Include all sub-Makefiles.
3 changes: 2 additions & 1 deletion perl/Makefile
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,9 @@ GLOBAL_CXXFLAGS += -g -Wall
OPTIMIZE = 1

ifeq ($(OPTIMIZE), 1)
GLOBAL_CFLAGS += -O3
GLOBAL_CXXFLAGS += -O3
else
GLOBAL_CXXFLAGS += -O0
endif

include mk/lib.mk
14 changes: 7 additions & 7 deletions perl/configure.ac
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ CFLAGS=
CXXFLAGS=
AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11

# Use 64-bit file system calls so that we can support files > 2 GiB.
AC_SYS_LARGEFILE
@@ -69,14 +68,15 @@ AC_SUBST(perlFlags)

PKG_CHECK_MODULES([NIX], [nix-store])

NEED_PROG([NIX_INSTANTIATE_PROGRAM], [nix-instantiate])
NEED_PROG([NIX], [nix])

# Get nix configure values
nixbindir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixBinDir | tr -d \")
nixlibexecdir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixLibexecDir | tr -d \")
nixlocalstatedir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixLocalstateDir | tr -d \")
nixsysconfdir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixSysconfDir | tr -d \")
nixstoredir=$("$NIX_INSTANTIATE_PROGRAM" --eval '<nix/config.nix>' -A nixStoreDir | tr -d \")
export NIX_REMOTE=daemon
nixbindir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixBinDir)
nixlibexecdir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixLibexecDir)
nixlocalstatedir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixLocalstateDir)
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(nixlibexecdir)
AC_SUBST(nixlocalstatedir)