Skip to content

slapos
slapos
Commit e976ceae authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

drop deprecated OpenSSL 1.0.x and use OpenSSL 1.1.x instead.

parent 6060d901
Pipeline #20273 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 7 additions and 370 deletions
    component/nodejs/buildout.cfg
    View file @ e976ceae
    ......@@ -49,7 +49,7 @@ PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
    # Server-side Javascript.
    version =
    md5sum =
    openssl_location = ${openssl-1.0:location}
    openssl_location = ${openssl:location}
    recipe = slapos.recipe.cmmi
    shared = true
    ......
    component/openssl/buildout.cfg
    View file @ e976ceae
    ......@@ -7,7 +7,6 @@
    extends =
    ../ca-certificates/buildout.cfg
    ../coreutils/buildout.cfg
    ../patch/buildout.cfg
    ../perl/buildout.cfg
    ../zlib/buildout.cfg
    ......@@ -54,37 +53,3 @@ update-command = ${:command}
    command = ${coreutils-output:test} -x ${:openssl}
    openssl = ${openssl:location}/bin/openssl
    bin = ${openssl:location}
    [openssl-1.0]
    recipe = slapos.recipe.cmmi
    shared = true
    url = https://www.openssl.org/source/openssl-1.0.2u.tar.gz
    md5sum = cdc2638f789ecc2db2c91488265686c1
    location = @@LOCATION@@
    # 'prefix' option to override --openssldir/--prefix (which is useful
    # when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
    prefix = ${:location}
    patch-binary = ${patch:location}/bin/patch
    patches =
    ${:_profile_base_location_}/openssl-nodoc.patch#a78c14908fe9ec624b1fb9fa97e01bb9
    ${:_profile_base_location_}/openssl-1.0.2d-parallel-build.patch#e4cf66a48a85a0da68fd4842e6fab54b
    patch-options = -p1
    configure-command = ./config
    configure-options =
    -I${zlib:location}/include
    -L${zlib:location}/lib
    --openssldir=${:prefix}/etc/ssl
    --prefix=${:prefix}
    --libdir=lib
    shared no-idea no-mdc2 no-rc5 zlib
    -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${:location}/lib
    && make depend
    make-options =
    SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
    make-targets =
    install_sw && x=${:location}/etc/ssl/certs && rm -f $x/* &&
    for i in ${ca-certificates:location}/certs/*/*.crt; do
    ln -sfv $i $x/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
    ; done
    environment =
    PERL=${perl:location}/bin/perl
    component/openssl/openssl-1.0.2d-parallel-build.patch deleted 100644 → 0
    View file @ 6060d901
    diff -ur openssl-1.0.2d.orig/crypto/Makefile openssl-1.0.2d/crypto/Makefile
    --- openssl-1.0.2d.orig/crypto/Makefile 2015-07-09 21:02:54.000000000 +0900
    +++ openssl-1.0.2d/crypto/Makefile 2015-07-09 22:59:19.585880610 +0900
    @@ -85,11 +85,11 @@
    @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
    subdirs:
    - @target=all; $(RECURSIVE_MAKE)
    + +@target=all; $(RECURSIVE_MAKE)
    files:
    $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
    - @target=files; $(RECURSIVE_MAKE)
    + +@target=files; $(RECURSIVE_MAKE)
    links:
    @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
    @@ -100,7 +100,7 @@
    # lib: $(LIB): are splitted to avoid end-less loop
    lib: $(LIB)
    @touch lib
    -$(LIB): $(LIBOBJ)
    +$(LIB): $(LIBOBJ) | subdirs
    $(AR) $(LIB) $(LIBOBJ)
    test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
    $(RANLIB) $(LIB) || echo Never mind.
    @@ -111,7 +111,7 @@
    fi
    libs:
    - @target=lib; $(RECURSIVE_MAKE)
    + +@target=lib; $(RECURSIVE_MAKE)
    install:
    @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
    @@ -120,7 +120,7 @@
    (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
    chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
    done;
    - @target=install; $(RECURSIVE_MAKE)
    + +@target=install; $(RECURSIVE_MAKE)
    lint:
    @target=lint; $(RECURSIVE_MAKE)
    diff -ur openssl-1.0.2d.orig/engines/Makefile openssl-1.0.2d/engines/Makefile
    --- openssl-1.0.2d.orig/engines/Makefile 2015-07-09 21:03:07.000000000 +0900
    +++ openssl-1.0.2d/engines/Makefile 2015-07-09 22:59:19.585880610 +0900
    @@ -72,7 +72,7 @@
    all: lib subdirs
    -lib: $(LIBOBJ)
    +lib: $(LIBOBJ) | subdirs
    @if [ -n "$(SHARED_LIBS)" ]; then \
    set -e; \
    for l in $(LIBNAMES); do \
    @@ -89,7 +89,7 @@
    subdirs:
    echo $(EDIRS)
    - @target=all; $(RECURSIVE_MAKE)
    + +@target=all; $(RECURSIVE_MAKE)
    files:
    $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
    @@ -128,7 +128,7 @@
    mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
    done; \
    fi
    - @target=install; $(RECURSIVE_MAKE)
    + +@target=install; $(RECURSIVE_MAKE)
    tags:
    ctags $(SRC)
    diff -ur openssl-1.0.2d.orig/Makefile.org openssl-1.0.2d/Makefile.org
    --- openssl-1.0.2d.orig/Makefile.org 2015-07-09 20:57:15.000000000 +0900
    +++ openssl-1.0.2d/Makefile.org 2015-07-09 22:59:57.214057201 +0900
    @@ -278,21 +278,21 @@
    build_libssl: build_ssl libssl.pc
    build_crypto:
    - @dir=crypto; target=all; $(BUILD_ONE_CMD)
    + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
    build_ssl: build_crypto
    - @dir=ssl; target=all; $(BUILD_ONE_CMD)
    + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
    build_engines: build_crypto
    - @dir=engines; target=all; $(BUILD_ONE_CMD)
    + +@dir=engines; target=all; $(BUILD_ONE_CMD)
    build_apps: build_libs
    - @dir=apps; target=all; $(BUILD_ONE_CMD)
    + +@dir=apps; target=all; $(BUILD_ONE_CMD)
    build_tests: build_libs
    - @dir=test; target=all; $(BUILD_ONE_CMD)
    + +@dir=test; target=all; $(BUILD_ONE_CMD)
    build_tools: build_libs
    - @dir=tools; target=all; $(BUILD_ONE_CMD)
    + +@dir=tools; target=all; $(BUILD_ONE_CMD)
    all_testapps: build_libs build_testapps
    build_testapps:
    - @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
    + +@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
    fips_premain_dso$(EXE_EXT): libcrypto.a
    [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
    @@ -543,7 +543,7 @@
    (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
    chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
    done;
    - @set -e; target=install; $(RECURSIVE_BUILD_CMD)
    + +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
    @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
    do \
    if [ -f "$$i" ]; then \
    diff -ur openssl-1.0.2d.orig/Makefile.shared openssl-1.0.2d/Makefile.shared
    --- openssl-1.0.2d.orig/Makefile.shared 2015-07-09 20:53:21.000000000 +0900
    +++ openssl-1.0.2d/Makefile.shared 2015-07-09 22:59:19.589880628 +0900
    @@ -105,6 +105,7 @@
    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
    + [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
    $${SHAREDCMD} $${SHAREDFLAGS} \
    -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
    @@ -122,6 +123,7 @@
    done; \
    fi; \
    if [ -n "$$SHLIB_SOVER" ]; then \
    + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
    ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
    ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
    fi; \
    diff -ur openssl-1.0.2d.orig/test/Makefile openssl-1.0.2d/test/Makefile
    --- openssl-1.0.2d.orig/test/Makefile 2015-07-09 21:03:09.000000000 +0900
    +++ openssl-1.0.2d/test/Makefile 2015-07-09 22:59:19.589880628 +0900
    @@ -134,7 +134,7 @@
    tags:
    ctags $(SRC)
    -tests: exe apps $(TESTS)
    +tests: exe $(TESTS)
    apps:
    @(cd ..; $(MAKE) DIRS=apps all)
    @@ -408,121 +408,121 @@
    link_app.$${shlib_target}
    $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
    - @target=$(RSATEST); $(BUILD_CMD)
    + +@target=$(RSATEST); $(BUILD_CMD)
    $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
    - @target=$(BNTEST); $(BUILD_CMD)
    + +@target=$(BNTEST); $(BUILD_CMD)
    $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
    - @target=$(ECTEST); $(BUILD_CMD)
    + +@target=$(ECTEST); $(BUILD_CMD)
    $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
    - @target=$(EXPTEST); $(BUILD_CMD)
    + +@target=$(EXPTEST); $(BUILD_CMD)
    $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
    - @target=$(IDEATEST); $(BUILD_CMD)
    + +@target=$(IDEATEST); $(BUILD_CMD)
    $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
    - @target=$(MD2TEST); $(BUILD_CMD)
    + +@target=$(MD2TEST); $(BUILD_CMD)
    $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
    - @target=$(SHATEST); $(BUILD_CMD)
    + +@target=$(SHATEST); $(BUILD_CMD)
    $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
    - @target=$(SHA1TEST); $(BUILD_CMD)
    + +@target=$(SHA1TEST); $(BUILD_CMD)
    $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
    - @target=$(SHA256TEST); $(BUILD_CMD)
    + +@target=$(SHA256TEST); $(BUILD_CMD)
    $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
    - @target=$(SHA512TEST); $(BUILD_CMD)
    + +@target=$(SHA512TEST); $(BUILD_CMD)
    $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
    - @target=$(RMDTEST); $(BUILD_CMD)
    + +@target=$(RMDTEST); $(BUILD_CMD)
    $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
    - @target=$(MDC2TEST); $(BUILD_CMD)
    + +@target=$(MDC2TEST); $(BUILD_CMD)
    $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
    - @target=$(MD4TEST); $(BUILD_CMD)
    + +@target=$(MD4TEST); $(BUILD_CMD)
    $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
    - @target=$(MD5TEST); $(BUILD_CMD)
    + +@target=$(MD5TEST); $(BUILD_CMD)
    $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
    - @target=$(HMACTEST); $(BUILD_CMD)
    + +@target=$(HMACTEST); $(BUILD_CMD)
    $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
    - @target=$(WPTEST); $(BUILD_CMD)
    + +@target=$(WPTEST); $(BUILD_CMD)
    $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
    - @target=$(RC2TEST); $(BUILD_CMD)
    + +@target=$(RC2TEST); $(BUILD_CMD)
    $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
    - @target=$(BFTEST); $(BUILD_CMD)
    + +@target=$(BFTEST); $(BUILD_CMD)
    $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
    - @target=$(CASTTEST); $(BUILD_CMD)
    + +@target=$(CASTTEST); $(BUILD_CMD)
    $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
    - @target=$(RC4TEST); $(BUILD_CMD)
    + +@target=$(RC4TEST); $(BUILD_CMD)
    $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
    - @target=$(RC5TEST); $(BUILD_CMD)
    + +@target=$(RC5TEST); $(BUILD_CMD)
    $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
    - @target=$(DESTEST); $(BUILD_CMD)
    + +@target=$(DESTEST); $(BUILD_CMD)
    $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
    - @target=$(RANDTEST); $(BUILD_CMD)
    + +@target=$(RANDTEST); $(BUILD_CMD)
    $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
    - @target=$(DHTEST); $(BUILD_CMD)
    + +@target=$(DHTEST); $(BUILD_CMD)
    $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
    - @target=$(DSATEST); $(BUILD_CMD)
    + +@target=$(DSATEST); $(BUILD_CMD)
    $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
    - @target=$(METHTEST); $(BUILD_CMD)
    + +@target=$(METHTEST); $(BUILD_CMD)
    $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
    - @target=$(SSLTEST); $(FIPS_BUILD_CMD)
    + +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
    $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
    - @target=$(ENGINETEST); $(BUILD_CMD)
    + +@target=$(ENGINETEST); $(BUILD_CMD)
    $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
    - @target=$(EVPTEST); $(BUILD_CMD)
    + +@target=$(EVPTEST); $(BUILD_CMD)
    $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
    - @target=$(EVPEXTRATEST); $(BUILD_CMD)
    + +@target=$(EVPEXTRATEST); $(BUILD_CMD)
    $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
    - @target=$(ECDSATEST); $(BUILD_CMD)
    + +@target=$(ECDSATEST); $(BUILD_CMD)
    $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
    - @target=$(ECDHTEST); $(BUILD_CMD)
    + +@target=$(ECDHTEST); $(BUILD_CMD)
    $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
    - @target=$(IGETEST); $(BUILD_CMD)
    + +@target=$(IGETEST); $(BUILD_CMD)
    $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
    - @target=$(JPAKETEST); $(BUILD_CMD)
    + +@target=$(JPAKETEST); $(BUILD_CMD)
    $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
    - @target=$(ASN1TEST); $(BUILD_CMD)
    + +@target=$(ASN1TEST); $(BUILD_CMD)
    $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
    - @target=$(SRPTEST); $(BUILD_CMD)
    + +@target=$(SRPTEST); $(BUILD_CMD)
    $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
    - @target=$(V3NAMETEST); $(BUILD_CMD)
    + +@target=$(V3NAMETEST); $(BUILD_CMD)
    $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
    - @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
    + +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
    $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
    - @target=$(CONSTTIMETEST) $(BUILD_CMD)
    + +@target=$(CONSTTIMETEST) $(BUILD_CMD)
    $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
    @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
    @@ -538,7 +538,7 @@
    # fi
    dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
    - @target=dummytest; $(BUILD_CMD)
    + +@target=dummytest; $(BUILD_CMD)
    # DO NOT DELETE THIS LINE -- make depend depends on it.
    component/openssl/openssl-nodoc.patch deleted 100644 → 0
    View file @ 6060d901
    diff -ur openssl-1.0.2c.orig/Makefile openssl-1.0.2c/Makefile
    --- openssl-1.0.2c.orig/Makefile 2015-06-12 17:10:40.000000000 +0200
    +++ openssl-1.0.2c/Makefile 2015-06-25 15:06:08.858209486 +0200
    @@ -528,7 +528,7 @@
    dist_pem_h:
    (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
    -install: all install_docs install_sw
    +install: all install_sw
    install_sw:
    @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
    component/ruby/buildout.cfg
    View file @ e976ceae
    ......@@ -20,8 +20,8 @@ configure-options =
    --with-out-ext=tk,tk/tkutil,win32,win32ole
    environment =
    PATH=${xz-utils:location}/bin:%(PATH)s
    CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
    LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl-1.0:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
    CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline:location}/include -I${zlib:location}/include
    LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
    PKG_CONFIG_PATH=${libyaml:location}/lib/
    ......
    software/gitlab/software.cfg
    View file @ e976ceae
    ......@@ -188,7 +188,7 @@ make-binary =
    make-targets= cd ${:path} &&
    ${:bundle} install --deployment --without development test mysql aws kerberos
    environment =
    PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
    PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
    PATH=${pkgconfig:location}/bin:%(PATH)s
    CFLAGS=-I${xz-utils:location}/include
    ......@@ -223,7 +223,7 @@ make-targets= cd ${go_github.com_libgit2_git2go:location}
    && sed -i 's/.*--build.*/cmake --build . --target install/' script/build-libgit2-static.sh
    && make install
    environment =
    PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
    PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
    PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang1.12:location}/bin:${buildout:bin-directory}:%(PATH)s
    GOPATH=${gowork:directory}
    ......@@ -239,7 +239,7 @@ golang = ${golang1.12:location}
    install =
    lab.nexedi.com/kirr/git-backup
    cpkgpath =
    ${openssl-1.0:location}/lib/pkgconfig
    ${openssl:location}/lib/pkgconfig
    ${zlib:location}/lib/pkgconfig
    ${go_github.com_libgit2_git2go_prepare:path}/vendor/libgit2/install/lib/pkgconfig
    buildflags = --tags "static"
    ......@@ -272,7 +272,7 @@ make-targets =
    unset GOBIN &&
    make
    environment =
    PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
    PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
    PATH=${pkgconfig:location}/bin:${ruby2.3:location}/bin:%(PATH)s
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7