mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix perl build

Browse source
This commit is contained in:
Eelco Dolstra 2017-03-31 15:31:34 +02:00
parent c0745a2531
commit d087700347
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
perl/Makefile
View file

@ -1,6 +1,6 @@
makefiles = local.mk makefiles = local.mk
GLOBAL_CXXFLAGS += -std=c++11 -g -Wall GLOBAL_CXXFLAGS += -std=c++14 -g -Wall -include nix/config.h
-include Makefile.config -include Makefile.config

1
perl/Makefile.config.in
View file

@ -16,4 +16,3 @@ perl = @perl@
perllibdir = @perllibdir@ perllibdir = @perllibdir@
nixstoredir = @nixstoredir@ nixstoredir = @nixstoredir@
nixsysconfdir = @nixsysconfdir@ nixsysconfdir = @nixsysconfdir@
perlbindings = @perlbindings@

2
perl/configure.ac
View file

@ -99,8 +99,6 @@ AC_SUBST(nixlocalstatedir)
AC_SUBST(nixsysconfdir) AC_SUBST(nixsysconfdir)
AC_SUBST(nixstoredir) AC_SUBST(nixstoredir)
AC_SUBST(perlbindings, "yes")
# Expand all variables in config.status. # Expand all variables in config.status.
test "$prefix" = NONE && prefix=$ac_default_prefix test "$prefix" = NONE && prefix=$ac_default_prefix
test "$exec_prefix" = NONE && exec_prefix='${prefix}' test "$exec_prefix" = NONE && exec_prefix='${prefix}'

46
perl/local.mk
View file

@ -10,38 +10,34 @@ nix_perl_modules := $(nix_perl_sources:.in=)
$(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllibdir)/Nix))) $(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllibdir)/Nix)))
ifeq ($(perlbindings), yes) lib/Nix/Store.cc: lib/Nix/Store.xs
lib/Nix/Store.cc: lib/Nix/Store.xs
$(trace-gen) xsubpp $^ -output $@ $(trace-gen) xsubpp $^ -output $@
libraries += Store libraries += Store
Store_DIR := lib/Nix Store_DIR := lib/Nix
Store_SOURCES := $(Store_DIR)/Store.cc Store_SOURCES := $(Store_DIR)/Store.cc
Store_CXXFLAGS = \ Store_CXXFLAGS = \
-I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \ -I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \
-D_FILE_OFFSET_BITS=64 \ -D_FILE_OFFSET_BITS=64 \
-Wno-unknown-warning-option -Wno-unused-variable -Wno-literal-suffix \ -Wno-unknown-warning-option -Wno-unused-variable -Wno-literal-suffix \
-Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion \ -Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion \
$(NIX_CFLAGS) $(NIX_CFLAGS)
Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS) Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS)
ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
endif
Store_ALLOW_UNDEFINED = 1
Store_FORCE_INSTALL = 1
Store_INSTALL_DIR = $(perllibdir)/auto/Nix/Store
ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
endif endif
Store_ALLOW_UNDEFINED = 1
Store_FORCE_INSTALL = 1
Store_INSTALL_DIR = $(perllibdir)/auto/Nix/Store
clean-files += lib/Nix/Config.pm lib/Nix/Store.cc Makefile.config clean-files += lib/Nix/Config.pm lib/Nix/Store.cc Makefile.config