Skip to content

Commit

Permalink
Update basement and foundations patches
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed May 8, 2024
1 parent 4fb7ccb commit ddfe272
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions patches/basement-0.0.16.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git b/basement.cabal a/basement.cabal
index 72125e015..b7670c3ee 100644
--- b/basement.cabal
+++ a/basement.cabal
diff --git a/basement.cabal b/basement.cabal
index f85f617..d8d9102 100644
--- a/basement.cabal
+++ b/basement.cabal
@@ -157,3 +157,5 @@ library
cpp-options: -DARCH_IS_UNKNOWN_ENDIAN
include-dirs: cbits
Expand Down
26 changes: 13 additions & 13 deletions patches/foundation-0.0.30.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
diff --git b/foundation.cabal a/foundation.cabal
index 224c61308..ef25e37f8 100644
--- b/foundation.cabal
+++ a/foundation.cabal
diff --git a/foundation.cabal b/foundation.cabal
index d33d874..3bf06bb 100644
--- a/foundation.cabal
+++ b/foundation.cabal
@@ -1,3 +1,4 @@
+cabal-version: 2.0
name: foundation
version: 0.0.26.1
version: 0.0.30
synopsis: Alternative prelude with batteries and no dependencies
@@ -28,7 +29,6 @@ category: foundation
build-type: Simple
homepage: https://github.com/haskell-foundation/foundation
bug-reports: https://github.com/haskell-foundation/foundation/issues
-cabal-version: 1.18
extra-source-files: cbits/*.h

source-repository head
@@ -190,13 +190,17 @@ library
if os(osx)
exposed-modules: Foundation.System.Bindings.Macos

+ if os(ghcjs)
+ js-sources: jsbits/bindings.js
+ extra-bundled-libraries: EMCCfoundation EMCCfoundation.exported
Expand All @@ -28,17 +28,17 @@ index 224c61308..ef25e37f8 100644
TypeFamilies
BangPatterns
DeriveDataTypeable

- if impl(ghc < 8.0) || impl(ghcjs)
+ if impl(ghc < 8.0)
- if impl(ghc < 8.10) || impl(ghcjs)
+ if impl(ghc < 8.10)
buildable: False
else
build-depends: base
diff --git b/jsbits/bindings.js a/jsbits/bindings.js
diff --git a/bindings.js b/bindings.js
new file mode 100644
index 000000000..fc51a85fe
index 0000000..fc51a85
--- /dev/null
+++ a/jsbits/bindings.js
+++ b/bindings.js
@@ -0,0 +1,61 @@
+
+// EMCC:EXPORTED_FUNCTIONS _malloc _free
Expand Down

0 comments on commit ddfe272

Please sign in to comment.