set LDFLAGS to include lib dir

Stefan-Olt · Jul 11, 2024 · 227a29c · 227a29c
1 parent 6d6fe85
commit 227a29c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml
@@ -49,10 +49,3 @@ jobs:
           ${PLUGIN_FILE} \
           --repo '${{ github.repository }}'
 
-      - name: Upload logs
-        uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: logs-all
-          path: ${{ github.workspace }}/build/**
-          retention-days: 3
diff --git a/plugins/ffms2.json b/plugins/ffms2.json
@@ -140,7 +140,7 @@
 					"commands": [
 						{ "cmd": ["tar", "xzf", "ffms2-5.0.tar.gz"] },
 						{ "cwd": "ffms2-5.0", "cmd": ["./autogen.sh"] },
-						{ "cwd": "ffms2-5.0", "flags": {"LDFLAGS": "-Wl,-Bsymbolic"}, "cmd": ["./configure", "--prefix={WORKSPACEDIR}"] },
+						{ "cwd": "ffms2-5.0", "flags": { "LDFLAGS": "-Wl,-Bsymbolic" }, "cmd": ["./configure", "--prefix={WORKSPACEDIR}"] },
 						{ "cwd": "ffms2-5.0", "cmd": ["make", "-j{NPROC}"] },
 						{ "cwd": "ffms2-5.0", "cmd": ["make", "install"] }
 					]

diff --git a/vsp-build.py b/vsp-build.py
@@ -51,6 +51,7 @@ def setup_environment() -> bool:
     environment['PKG_CONFIG_PATH'] = os.path.join(config_vars['WORKSPACEDIR'],'lib/pkgconfig')
     environment['LD_LIBRARY_PATH'] = os.path.join(config_vars['WORKSPACEDIR'],'lib')
     environment['CFLAGS'] = '-I'+os.path.join(config_vars['WORKSPACEDIR'],'include')+' '+environment.get('CFLAGS','')
+    environment['LDFLAGS'] = '-L'+os.path.join(config_vars['WORKSPACEDIR'],'lib')+' '+environment.get('LDFLAGS','')
     return True
 
 def compare_version(ver_a: str, ver_b: str) -> int: