fix(dotnet)

closes #7869
pkgxdev · Nov 10, 2024 · 296c5a0 · 296c5a0
1 parent a0fa155
commit 296c5a0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/projects/dotnet.microsoft.com/package.yml b/projects/dotnet.microsoft.com/package.yml
@@ -11,27 +11,30 @@ warnings:
 
 runtime:
   env:
-    DOTNET_ROOT: "{{prefix}}"
+    DOTNET_ROOT: '{{prefix}}'
+
 dependencies:
   linux:
     unicode.org: ^71
+    openssl.org: '*'
+
 build:
   dependencies:
     curl.se: '*'
   working-directory: ${{prefix}}
   script:
     - curl -L "https://dotnetcli.azureedge.net/dotnet/Sdk/{{version}}/dotnet-sdk-{{version}}-${PLATFORM}.tar.gz" | tar zxf -
     - run: ln -s ../dotnet ./dotnet
-      working-directory: "{{prefix}}/bin"
+      working-directory: '{{prefix}}/bin'
   env:
     darwin/aarch64: { PLATFORM: osx-arm64 }
-    darwin/x86-64:  { PLATFORM: osx-x64 }
-    linux/aarch64:  { PLATFORM: linux-arm64 }
-    linux/x86-64:   { PLATFORM: linux-x64 }
+    darwin/x86-64: { PLATFORM: osx-x64 }
+    linux/aarch64: { PLATFORM: linux-arm64 }
+    linux/x86-64: { PLATFORM: linux-x64 }
 
 provides:
   - bin/dotnet
 
 test:
-  script:
-    - dotnet --version | grep {{version}}
+  - dotnet --version | grep {{version}}
+  - dotnet new console -o test
diff --git a/projects/lftp.yar.ru/package.yml b/projects/lftp.yar.ru/package.yml
@@ -1,7 +1,5 @@
 distributable:
-  # Primary mirror seems to 404 a lot...
-  # url: https://lftp.yar.ru/ftp/lftp-{{ version }}.tar.xz
-  url: http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/lftp-{{ version }}.tar.xz
+  url: https://github.com/lavv17/lftp/releases/download/{{version.tag}}/lftp-{{version}}.tar.gz
   strip-components: 1
 
 versions:
@@ -15,15 +13,20 @@ dependencies:
   zlib.net: '*'
   invisible-island.net/ncurses: '*'
   libexpat.github.io: '*'
+  linux:
+    libcxx.llvm.org: '>=10'
 
 build:
-  script: |
-    ./configure $ARGS
-    make --jobs {{ hw.concurrency }} install
+  linux:
+    gnu.org/gcc: '*'
+    gnu.org/binutils: '*'
+  script:
+    - ./configure $ARGS
+    - make --jobs {{ hw.concurrency }} install
   env:
-    darwin:
-      # https://github.com/lavv17/lftp/issues/611
-      CFLAGS: '$CFLAGS -Wno-implicit-function-declaration'
+    # https://github.com/lavv17/lftp/issues/611
+    CFLAGS: '$CFLAGS -Wno-implicit-function-declaration'
+    CXXFLAGS: '$CXXFLAGS -cxx-isystem {{deps.libcxx.llvm.org.prefix}}/include/c++/v1'
     ARGS:
       - --prefix="{{prefix}}"
       - --with-openssl="{{deps.openssl.org.prefix}}"