linux sdk: add --libdir to meson params (for Ubuntu)

MX-05 · Mar 4, 2021 · 636eefe · 636eefe
1 parent 206db96
commit 636eefe
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/tools/jenkins/include/scripts/pkg/dav1d.sh b/tools/jenkins/include/scripts/pkg/dav1d.sh
@@ -14,7 +14,7 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/dav1d.pc" ]
     pushd "dav1d-$DAV1D_VERSION"
     mkdir build
     pushd build
-    env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME"
+    env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" --libdir="lib"
     env CFLAGS="$BF" CXXFLAGS="$BF" ninja
     env CFLAGS="$BF" CXXFLAGS="$BF" ninja install
     popd

diff --git a/tools/jenkins/include/scripts/pkg/gdk-pixbuf.sh b/tools/jenkins/include/scripts/pkg/gdk-pixbuf.sh
@@ -18,7 +18,7 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/gdk-pixbuf-2
         mkdir build
         pushd build
 
-        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" \
+        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" --libdir="lib" \
           -Dtiff=false -Dman=false -Ddocs=false -Dgtk_doc=false \
           ..
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja

diff --git a/tools/jenkins/include/scripts/pkg/glib.sh b/tools/jenkins/include/scripts/pkg/glib.sh
@@ -28,8 +28,8 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/glib-2.0.pc"
 		patch -Np1 -i "$INC_PATH/patches/glib/glib-2.60.2-skip_warnings-1.patch"
 		mkdir build
 		pushd build
-		env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME"      \
-			-Dman=false -Dgtk_doc=false        \
+		env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" --libdir="lib" \
+			-Dman=false -Dgtk_doc=false \
 			-Dselinux=disabled \
 			..
 		env CFLAGS="$BF" CXXFLAGS="$BF" ninja

diff --git a/tools/jenkins/include/scripts/pkg/orc.sh b/tools/jenkins/include/scripts/pkg/orc.sh
@@ -16,7 +16,7 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/orc-0.4.pc"
     if version_gt "$ORC_VERSION" 0.4.29; then
         mkdir build
         pushd build
-        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME"
+        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" --libdir="lib"
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja install
         popd

diff --git a/tools/jenkins/include/scripts/pkg/pango.sh b/tools/jenkins/include/scripts/pkg/pango.sh
@@ -22,7 +22,7 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/pango.pc" ]
         mkdir build
         pushd build
 
-        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" ..
+        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" --libdir="lib" ..
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja install
         popd

diff --git a/tools/jenkins/include/scripts/pkg/shared-mime-info.sh b/tools/jenkins/include/scripts/pkg/shared-mime-info.sh
@@ -19,7 +19,7 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/share/pkgconfig/shared-mim
         make
         make install
     else
-        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" -Dupdate-mimedb=true ..
+        env CFLAGS="$BF" CXXFLAGS="$BF" meson --prefix="$SDK_HOME" --libdir="lib" -Dupdate-mimedb=true ..
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja
         env CFLAGS="$BF" CXXFLAGS="$BF" ninja install
     fi