pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
projectable: finish package
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Thu Jun 29 12:59:07 2023 +0200
Changeset: e2fae338f7f2e9c6c49c33ff3032f79396778614
Modified Files:
projectable/Makefile
projectable/PLIST
projectable/distinfo
Added Files:
projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs
Removed Files:
projectable/TODO
Log Message:
projectable: finish package
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e2fae338f7f2e9c6c49c33ff3032f79396778614
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
projectable/Makefile | 3 +-
projectable/PLIST | 4 +-
projectable/TODO | 103 ---------------------
projectable/distinfo | 1 +
...._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs | 60 ++++++++++++
5 files changed, 64 insertions(+), 107 deletions(-)
diffs:
diff --git a/projectable/Makefile b/projectable/Makefile
index c6a0b2eb71..b8628e72a0 100644
--- a/projectable/Makefile
+++ b/projectable/Makefile
@@ -1,5 +1,6 @@
# $NetBSD$
+# Do not import. Requires Rust-1.70 or higher
DISTNAME= projectable-1.2.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GITHUB:=dzfrias/}
@@ -12,7 +13,7 @@ LICENSE= mit
.include "cargo-depends.mk"
USE_LANGUAGES+= c c++
-USE_TOOLS+= pkg-config perl
+USE_TOOLS+= pkg-config perl gmake
MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
diff --git a/projectable/PLIST b/projectable/PLIST
index 92ba51a2d7..4a4d56f41a 100644
--- a/projectable/PLIST
+++ b/projectable/PLIST
@@ -1,4 +1,2 @@
@comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+bin/prj
diff --git a/projectable/TODO b/projectable/TODO
deleted file mode 100644
index 7871a2fd7e..0000000000
--- a/projectable/TODO
+++ /dev/null
@@ -1,103 +0,0 @@
-https://github.com/dzfrias/projectable/issues/16
-
-error: failed to run custom build command for `openssl-sys v0.9.88`
-
-Caused by:
- process didn't exit successfully: `/usr/pkgsrc/wip/projectable/work/projectable-1.2.0/target/release/build/openssl-sys-9774f3ac53ec23c7/build-script-main` (exit status: 101)
- --- stdout
- cargo:rerun-if-env-changed=X86_64_UNKNOWN_NETBSD_OPENSSL_NO_VENDOR
- X86_64_UNKNOWN_NETBSD_OPENSSL_NO_VENDOR unset
- cargo:rerun-if-env-changed=OPENSSL_NO_VENDOR
- OPENSSL_NO_VENDOR unset
- cargo:rerun-if-env-changed=CC_x86_64-unknown-netbsd
- CC_x86_64-unknown-netbsd = None
- cargo:rerun-if-env-changed=CC_x86_64_unknown_netbsd
- CC_x86_64_unknown_netbsd = None
- cargo:rerun-if-env-changed=HOST_CC
- HOST_CC = None
- cargo:rerun-if-env-changed=CC
- CC = Some("gcc")
- cargo:rerun-if-env-changed=CFLAGS_x86_64-unknown-netbsd
- CFLAGS_x86_64-unknown-netbsd = None
- cargo:rerun-if-env-changed=CFLAGS_x86_64_unknown_netbsd
- CFLAGS_x86_64_unknown_netbsd = None
- cargo:rerun-if-env-changed=HOST_CFLAGS
- HOST_CFLAGS = None
- cargo:rerun-if-env-changed=CFLAGS
- CFLAGS = Some("-pipe -O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/include")
- cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
- CRATE_CC_NO_DEFAULTS = None
- DEBUG = Some("false")
- CARGO_CFG_TARGET_FEATURE = Some("fxsr,sse,sse2")
- cargo:rerun-if-env-changed=AR_x86_64-unknown-netbsd
- AR_x86_64-unknown-netbsd = None
- cargo:rerun-if-env-changed=AR_x86_64_unknown_netbsd
- AR_x86_64_unknown_netbsd = None
- cargo:rerun-if-env-changed=HOST_AR
- HOST_AR = None
- cargo:rerun-if-env-changed=AR
- AR = None
- cargo:rerun-if-env-changed=ARFLAGS_x86_64-unknown-netbsd
- ARFLAGS_x86_64-unknown-netbsd = None
- cargo:rerun-if-env-changed=ARFLAGS_x86_64_unknown_netbsd
- ARFLAGS_x86_64_unknown_netbsd = None
- cargo:rerun-if-env-changed=HOST_ARFLAGS
- HOST_ARFLAGS = None
- cargo:rerun-if-env-changed=ARFLAGS
- ARFLAGS = None
- cargo:rerun-if-env-changed=RANLIB_x86_64-unknown-netbsd
- RANLIB_x86_64-unknown-netbsd = None
- cargo:rerun-if-env-changed=RANLIB_x86_64_unknown_netbsd
- RANLIB_x86_64_unknown_netbsd = None
- cargo:rerun-if-env-changed=HOST_RANLIB
- HOST_RANLIB = None
- cargo:rerun-if-env-changed=RANLIB
- RANLIB = None
- cargo:rerun-if-env-changed=RANLIBFLAGS_x86_64-unknown-netbsd
- RANLIBFLAGS_x86_64-unknown-netbsd = None
- cargo:rerun-if-env-changed=RANLIBFLAGS_x86_64_unknown_netbsd
- RANLIBFLAGS_x86_64_unknown_netbsd = None
- cargo:rerun-if-env-changed=HOST_RANLIBFLAGS
- HOST_RANLIBFLAGS = None
- cargo:rerun-if-env-changed=RANLIBFLAGS
- RANLIBFLAGS = None
- running cd "/usr/pkgsrc/wip/projectable/work/projectable-1.2.0/target/release/build/openssl-sys-73293c510d814956/out/openssl-build/build/src" && AR="ar" CC="gcc" RANLIB="ranlib" "perl" "./Configure" "--prefix=/usr/pkgsrc/wip/projectable/work/projectable-1.2.0/target/release/build/openssl-sys-73293c510d814956/out/openssl-build/install" "--openssldir=/usr/local/ssl" "no-dso" "no-shared" "no-ssl3" "no-unit-test" "no-comp" "no-zlib" "no-zlib-dynamic" "no-md2" "no-rc5" "no-weak-ssl-ciphers" "no-camellia" "no-idea" "no-seed" "BSD-x86_64" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-pipe" "-O2" "-fPIC" "-D_FORTIFY_SOURCE=2" "-I/usr/pkg/include" "-I/usr/include"
- Configuring OpenSSL version 1.1.1u (0x1010115fL) for BSD-x86_64
- Using os-specific seed configuration
- Creating configdata.pm
- Creating Makefile
-
- **********************************************************************
- *** ***
- *** OpenSSL has been successfully configured ***
- *** ***
- *** If you encounter a problem while building, please open an ***
- *** issue on GitHub <https://github.com/openssl/openssl/issues> ***
- *** and include the output from the following command: ***
- *** ***
- *** perl configdata.pm --dump ***
- *** ***
- *** (If you are new to OpenSSL, you might want to consult the ***
- *** 'Troubleshooting' section in the INSTALL file first) ***
- *** ***
- **********************************************************************
- running cd "/usr/pkgsrc/wip/projectable/work/projectable-1.2.0/target/release/build/openssl-sys-73293c510d814956/out/openssl-build/build/src" && "make" "depend"
- running cd "/usr/pkgsrc/wip/projectable/work/projectable-1.2.0/target/release/build/openssl-sys-73293c510d814956/out/openssl-build/build/src" && MAKEFLAGS="-j --jobserver-fds=5,6 --jobserver-auth=5,6" "make" "build_libs"
-
- --- stderr
- make: illegal argument to -j -- must be positive integer!
- thread 'main' panicked at '
-
-
- Error building OpenSSL:
- Command: cd "/usr/pkgsrc/wip/projectable/work/projectable-1.2.0/target/release/build/openssl-sys-73293c510d814956/out/openssl-build/build/src" && MAKEFLAGS="-j --jobserver-fds=5,6 --jobserver-auth=5,6" "make" "build_libs"
- Exit status: exit status: 2
-
-
- ', /usr/pkgsrc/wip/projectable/work/vendor/openssl-src-111.26.0+1.1.1u/src/lib.rs:506:13
- note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-warning: build failed, waiting for other jobs to finish...
-*** Error code 101
-
-Stop.
-make[1]: stopped
diff --git a/projectable/distinfo b/projectable/distinfo
index da579a0eb8..3a4d55c2aa 100644
--- a/projectable/distinfo
+++ b/projectable/distinfo
@@ -762,3 +762,4 @@ Size (winnow-0.3.6.crate) = 176641 bytes
BLAKE2s (wyz-0.5.1.crate) = dc39cd7a740b1e5bc6799cf3f502684350913a83f457249d2c868ede49ad0849
SHA512 (wyz-0.5.1.crate) = 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
Size (wyz-0.5.1.crate) = 18790 bytes
+SHA1 (patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs) = 614576904a7c4d88f814130badc24e1dd1865789
diff --git a/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs b/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs
new file mode 100644
index 0000000000..655d20e57c
--- /dev/null
+++ b/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs
@@ -0,0 +1,60 @@
+$NetBSD$
+
+Provide defaults for the various NetBSD targets.
+
+--- ../vendor/openssl-src-111.26.0+1.1.1u/src/lib.rs.orig 2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/openssl-src-111.26.0+1.1.1u/src/lib.rs
+@@ -239,6 +239,8 @@ impl Build {
+ "aarch64-unknown-freebsd" => "BSD-generic64",
+ "aarch64-unknown-linux-gnu" => "linux-aarch64",
+ "aarch64-unknown-linux-musl" => "linux-aarch64",
++ "aarch64-unknown-netbsd" => "BSD-generic64",
++ "aarch64_be-unknown-netbsd" => "BSD-generic64",
+ "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
+ "arm-linux-androideabi" => "linux-armv4",
+ "armv7-linux-androideabi" => "linux-armv4",
+@@ -249,11 +251,13 @@ impl Build {
+ "armv5te-unknown-linux-gnueabi" => "linux-armv4",
+ "armv5te-unknown-linux-musleabi" => "linux-armv4",
+ "armv6-unknown-freebsd" => "BSD-generic32",
++ "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
+ "armv7-unknown-freebsd" => "BSD-generic32",
+ "armv7-unknown-linux-gnueabi" => "linux-armv4",
+ "armv7-unknown-linux-musleabi" => "linux-armv4",
+ "armv7-unknown-linux-gnueabihf" => "linux-armv4",
+ "armv7-unknown-linux-musleabihf" => "linux-armv4",
++ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
+ "asmjs-unknown-emscripten" => "gcc",
+ "i586-unknown-linux-gnu" => "linux-elf",
+ "i586-unknown-linux-musl" => "linux-elf",
+@@ -264,6 +268,8 @@ impl Build {
+ "i686-unknown-freebsd" => "BSD-x86-elf",
+ "i686-unknown-linux-gnu" => "linux-elf",
+ "i686-unknown-linux-musl" => "linux-elf",
++ "i686-unknown-netbsd" => "BSD-x86-elf",
++ "i586-unknown-netbsd" => "BSD-x86-elf",
+ "loongarch64-unknown-linux-gnu" => "linux64-loongarch64",
+ "mips-unknown-linux-gnu" => "linux-mips32",
+ "mips-unknown-linux-musl" => "linux-mips32",
+@@ -273,18 +279,21 @@ impl Build {
+ "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
+ "mipsel-unknown-linux-gnu" => "linux-mips32",
+ "mipsel-unknown-linux-musl" => "linux-mips32",
++ "mipsel-unknown-netbsd" => "NetBSD-generic32",
+ "powerpc-unknown-freebsd" => "BSD-generic32",
+ "powerpc-unknown-linux-gnu" => "linux-ppc",
+ "powerpc-unknown-linux-gnuspe" => "linux-ppc",
+ "powerpc64-unknown-freebsd" => "BSD-generic64",
+ "powerpc64-unknown-linux-gnu" => "linux-ppc64",
+ "powerpc64-unknown-linux-musl" => "linux-ppc64",
++ "powerpc64-unknown-freebsd" => "BSD-generic64",
+ "powerpc64le-unknown-freebsd" => "BSD-generic64",
+ "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+ "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
+ "riscv64gc-unknown-linux-gnu" => "linux-generic64",
+ "s390x-unknown-linux-gnu" => "linux64-s390x",
+ "s390x-unknown-linux-musl" => "linux64-s390x",
++ "sparc64-unknown-netbsd" => "BSD-generic64",
+ "x86_64-apple-darwin" => "darwin64-x86_64-cc",
+ "x86_64-linux-android" => "linux-x86_64",
+ "x86_64-pc-windows-gnu" => "mingw64",
Home |
Main Index |
Thread Index |
Old Index