cleanup

Author: tobtoht

.gitignore

@@ -27,7 +27,6 @@ ClangBuildAnalyzerSession.txt
 
 # guix
 /guix
-/cargo
 
 # Created by https://www.gitignore.io
 

contrib/depends/packages/fcmp_pp_rust.mk

@@ -1,4 +1,4 @@
-native_packages:=rustc fcmp_pp_rust_deps
+native_packages:=fcmp_pp_rust_deps
 packages:=boost openssl zeromq expat unbound sodium
 
 hardware_packages := hidapi protobuf libusb
@@ -11,7 +11,7 @@ darwin_native_packages = $(hardware_native_packages)
 darwin_packages = ncurses readline $(hardware_packages)
 
 # not really native...
-freebsd_native_packages = native_binutils freebsd_base $(hardware_native_packages)
+freebsd_native_packages = freebsd_base $(hardware_native_packages)
 freebsd_packages = ncurses readline protobuf libusb
 
 linux_packages = eudev ncurses readline $(hardware_packages)

contrib/depends/packages/native_binutils.mk

@@ -4,6 +4,7 @@
              (gnu packages rust)
              (gnu packages compression)
              (gnu packages wget)
+             (gnu packages gawk)
              ((gnu packages tls) #:select (openssl)))
 
 (packages->manifest
@@ -17,4 +18,7 @@
       tar
       gzip
       wget
+      sed
+      gawk
+      grep
       (list rust "cargo"))))

contrib/depends/packages/packages.mk

@@ -0,0 +1,65 @@
+addr2line
+adler
+ahash
+bitvec
+blake2
+block-buffer
+cfg-if
+ciphersuite
+compiler_builtins
+cpufeatures
+crypto-bigint
+crypto-common
+curve25519-dalek
+curve25519-dalek-derive
+dalek-ff-group
+digest
+ec-divisors
+ff
+flexible-transcript
+full-chain-membership-proofs
+funty
+generalized-bulletproofs
+generalized-bulletproofs-circuit-abstraction
+generalized-bulletproofs-ec-gadgets
+generalized-schnorr
+generic-array
+getrandom
+gimli
+group
+hashbrown
+helioselene
+hex
+keccak
+libc
+memchr
+miniz_oxide
+monero-fcmp-plus-plus
+monero-generators
+monero-io
+monero-primitives
+multiexp
+object
+once_cell
+proc-macro2
+quote
+radium
+rand_core
+rustc-demangle
+rustc_version
+rustversion
+semver
+sha2
+sha3
+spin
+std-shims
+subtle
+syn
+tap
+typenum
+unicode-ident
+version_check
+wyz
+zerocopy
+zeroize
+zeroize_derive

contrib/depends/packages/rustc.mk

@@ -49,36 +49,6 @@ DISTNAME="monero-${HOST}-${VERSION}"
 # Use a fixed timestamp for depends builds so hashes match across commits that don't make changes to the build system
 export SOURCE_DATE_EPOCH=1397818193
 
-# Given a package name and an output name, return the path of that output in our
-# current guix environment
-store_path() {
-    grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \
-        | head --lines=1 \
-        | sed --expression='s|\x29*$||' \
-              --expression='s|^[[:space:]]*"||' \
-              --expression='s|"[[:space:]]*$||'
-}
-
-#####################
-#    Rust Setup     #
-#####################
-
-RUST_TARGET=$(
-    case "$HOST" in
-        x86_64-linux-gnu)      echo x86_64-unknown-linux-gnu ;;
-        aarch64-linux-gnu)     echo aarch64-unknown-linux-gnu ;;
-        arm-linux-gnueabihf)   echo armv7-unknown-linux-gnueabihf ;;
-        riscv64-linux-gnu)     echo riscv64gc-unknown-linux-gnu ;;
-        i686-linux-gnu)        echo i686-unknown-linux-gnu ;;
-        x86_64-w64-mingw32)    echo x86_64-pc-windows-gnu ;;
-        i686-w64-mingw32)      echo i686-pc-windows-gnu ;;
-        arm-linux-androideabi) echo armv7-linux-androideabi ;;
-        *)                     echo "$HOST" ;;
-    esac
-)
-
-export RUST_TARGET
-
 #####################
 # Environment Setup #
 #####################
@@ -92,6 +62,17 @@ printenv | sort | grep -v '^\(BASE_CACHE=\|DISTNAME=\|DISTSRC=\|OUTDIR=\|LOGDIR=
 # $HOSTs after successfully building.
 BASEPREFIX="${PWD}/contrib/depends"
 
+# Given a package name and an output name, return the path of that output in our
+# current guix environment
+store_path() {
+    grep --extended-regexp "/[^-]{32}-${1}-[^-]+${2:+-${2}}" "${GUIX_ENVIRONMENT}/manifest" \
+        | head --lines=1 \
+        | sed --expression='s|\x29*$||' \
+              --expression='s|^[[:space:]]*"||' \
+              --expression='s|"[[:space:]]*$||'
+}
+
+
 # Set environment variables to point the NATIVE toolchain to the right
 # includes/libs
 NATIVE_GCC="$(store_path gcc-toolchain)"
@@ -118,8 +99,6 @@ prepend_to_search_env_var() {
 # includes/libs for $HOST
 case "$HOST" in
     *mingw*)
-        export LD_LIBRARY_PATH="${NATIVE_GCC}/lib"
-
         # Determine output paths to use in CROSS_* environment variables
         case "$HOST" in
             i686-*)    CROSS_GLIBC="$(store_path "mingw-w64-i686-winpthreads")" ;;
@@ -159,16 +138,14 @@ case "$HOST" in
         export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include:${CROSS_KERNEL}/include"
         export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
         export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib:${CROSS_GLIBC_STATIC}/lib"
-
-        # Todo: remove this hack
-        export LD_LIBRARY_PATH="/gnu/store/4az5pnqqpkpf4hmfknb0d73jwgx935nm-gcc-12.3.0-lib/lib"
         ;;
     *freebsd*)
         ;;
     *)
         exit 1 ;;
 esac
 
+# TODO
 export LD_LIBRARY_PATH="$(store_path xz)/lib:${NATIVE_GCC}/lib:$(store_path zlib)/lib"
 
 # Sanity check CROSS_*_PATH directories
@@ -332,7 +309,8 @@ mkdir -p "$DISTSRC"
       -DCMAKE_EXE_LINKER_FLAGS="${HOST_LDFLAGS}" \
       -DCMAKE_SHARED_LINKER_FLAGS="${HOST_LDFLAGS}" \
       -DCMAKE_SKIP_RPATH=ON \
-      -DMANUAL_SUBMODULES=1
+      -DMANUAL_SUBMODULES=1 \
+      -DGUIX=1
 
     make -C build --jobs="$JOBS"