From 1935eff0b1738ae1293cc8a1a8b4e27a88ffb982 Mon Sep 17 00:00:00 2001 From: quidtum Date: Tue, 22 Feb 2022 21:10:45 -0500 Subject: build --- dbreset/Main.hs | 2 +- dist/dbreset-exe | Bin 22359912 -> 24105368 bytes dist/spectralrenga-exe | Bin 22356968 -> 24102456 bytes lib/ld-linux-x86-64.so.2 | Bin 221480 -> 0 bytes lib/libc.so.6 | Bin 2150424 -> 0 bytes lib/libdl.so.2 | Bin 22704 -> 0 bytes lib/libgmp.a | Bin 0 -> 1311446 bytes lib/libgmp.so.10 | Bin 649512 -> 0 bytes lib/libm.so.6 | Bin 1323472 -> 0 bytes lib/libpthread.so.0 | Bin 154040 -> 0 bytes lib/librt.so.1 | Bin 39408 -> 0 bytes lib/libutil.so.1 | Bin 14440 -> 0 bytes lib/libz.so.1 | Bin 100096 -> 0 bytes package.yaml | 12 ++++++++++++ spectralrenga.cabal | 14 +++++++++++--- src/Lib.hs | 1 + 16 files changed, 25 insertions(+), 4 deletions(-) delete mode 100755 lib/ld-linux-x86-64.so.2 delete mode 100755 lib/libc.so.6 delete mode 100755 lib/libdl.so.2 create mode 100644 lib/libgmp.a delete mode 100755 lib/libgmp.so.10 delete mode 100755 lib/libm.so.6 delete mode 100755 lib/libpthread.so.0 delete mode 100755 lib/librt.so.1 delete mode 100755 lib/libutil.so.1 delete mode 100755 lib/libz.so.1 diff --git a/dbreset/Main.hs b/dbreset/Main.hs index 83d8cb8..1f829d1 100644 --- a/dbreset/Main.hs +++ b/dbreset/Main.hs @@ -21,5 +21,5 @@ main = withTx $ \conn -> do execute_ conn "CREATE INDEX idx_arrows_dst ON arrows(dst);" g <- newStdGen >>= newIOGenM graphSpec <- makeDefaultGraphSpec g - Lib.createDomain conn (DomainName "piazza") graphSpec + _ <- Lib.createDomain conn (DomainName "piazza") graphSpec return () diff --git a/dist/dbreset-exe b/dist/dbreset-exe index 3161336..9d5a8c7 100755 Binary files a/dist/dbreset-exe and b/dist/dbreset-exe differ diff --git a/dist/spectralrenga-exe b/dist/spectralrenga-exe index c2188f3..b9cb94c 100755 Binary files a/dist/spectralrenga-exe and b/dist/spectralrenga-exe differ diff --git a/lib/ld-linux-x86-64.so.2 b/lib/ld-linux-x86-64.so.2 deleted file mode 100755 index e55a6ee..0000000 Binary files a/lib/ld-linux-x86-64.so.2 and /dev/null differ diff --git a/lib/libc.so.6 b/lib/libc.so.6 deleted file mode 100755 index bf1f7f0..0000000 Binary files a/lib/libc.so.6 and /dev/null differ diff --git a/lib/libdl.so.2 b/lib/libdl.so.2 deleted file mode 100755 index 2eb425e..0000000 Binary files a/lib/libdl.so.2 and /dev/null differ diff --git a/lib/libgmp.a b/lib/libgmp.a new file mode 100644 index 0000000..5886d4a Binary files /dev/null and b/lib/libgmp.a differ diff --git a/lib/libgmp.so.10 b/lib/libgmp.so.10 deleted file mode 100755 index bb9d701..0000000 Binary files a/lib/libgmp.so.10 and /dev/null differ diff --git a/lib/libm.so.6 b/lib/libm.so.6 deleted file mode 100755 index acc93c8..0000000 Binary files a/lib/libm.so.6 and /dev/null differ diff --git a/lib/libpthread.so.0 b/lib/libpthread.so.0 deleted file mode 100755 index dd6fd87..0000000 Binary files a/lib/libpthread.so.0 and /dev/null differ diff --git a/lib/librt.so.1 b/lib/librt.so.1 deleted file mode 100755 index 0dc565d..0000000 Binary files a/lib/librt.so.1 and /dev/null differ diff --git a/lib/libutil.so.1 b/lib/libutil.so.1 deleted file mode 100755 index 7fa6bbf..0000000 Binary files a/lib/libutil.so.1 and /dev/null differ diff --git a/lib/libz.so.1 b/lib/libz.so.1 deleted file mode 100755 index 3dad5f1..0000000 Binary files a/lib/libz.so.1 and /dev/null differ diff --git a/package.yaml b/package.yaml index ff152a1..fcb31e7 100644 --- a/package.yaml +++ b/package.yaml @@ -47,6 +47,12 @@ executables: - -threaded - -rtsopts - -with-rtsopts=-N + - -static + - -Wall + - -O2 + cc-options: -static + ld-options: -static -pthread + extra-lib-dirs: ./lib/ dependencies: - base - spectralrenga @@ -57,6 +63,12 @@ executables: - -threaded - -rtsopts - -with-rtsopts=-N + - -static + - -Wall + - -O2 + cc-options: -static + ld-options: -static -pthread + extra-lib-dirs: ./lib/ dependencies: - base - spectralrenga diff --git a/spectralrenga.cabal b/spectralrenga.cabal index 4188e11..3910008 100644 --- a/spectralrenga.cabal +++ b/spectralrenga.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.2. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack @@ -47,7 +47,11 @@ executable dbreset-exe Paths_spectralrenga hs-source-dirs: dbreset - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -threaded -rtsopts -with-rtsopts=-N -static -Wall -O2 + cc-options: -static + extra-lib-dirs: + ./lib/ + ld-options: -static -pthread build-depends: base , containers @@ -72,7 +76,11 @@ executable spectralrenga-exe Paths_spectralrenga hs-source-dirs: app - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -threaded -rtsopts -with-rtsopts=-N -static -Wall -O2 + cc-options: -static + extra-lib-dirs: + ./lib/ + ld-options: -static -pthread build-depends: base , containers diff --git a/src/Lib.hs b/src/Lib.hs index 629ed4f..6842144 100644 --- a/src/Lib.hs +++ b/src/Lib.hs @@ -822,6 +822,7 @@ headMay [] = Nothing headMay (x:_) = Just x data HeadException = HeadException deriving (Show) + instance E.Exception HeadException mustHead :: [a] -> IO a -- cgit v1.2.3