Merge pull request #371 from eean/fixOpenSUSEbuild

argilo · web-flow · commit 04a89e78aed2 · 2025-03-06T00:13:08.000-05:00
Fix build on openSUSE 15.6
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -226,7 +226,7 @@ if (USE_FAAD2)
         PATCH_COMMAND patch -p1 -Ni "${CMAKE_SOURCE_DIR}/support/faad2-hdc-support.patch" || exit 0
         COMMAND sh ./bootstrap
 
-        CONFIGURE_COMMAND ${FAAD2_PREFIX}/src/faad2_external/configure ${HOST_TRIPLE_ARG} ${FAAD2_CONFIGURE_ARGS} --prefix=${FAAD2_PREFIX} "CFLAGS=-O2 -fPIC ${CMAKE_C_FLAGS}"
+        CONFIGURE_COMMAND ${FAAD2_PREFIX}/src/faad2_external/configure ${HOST_TRIPLE_ARG} ${FAAD2_CONFIGURE_ARGS} --prefix=${FAAD2_PREFIX} --libdir=${FAAD2_PREFIX}/lib "CFLAGS=-O2 -fPIC ${CMAKE_C_FLAGS}"
     )
 
     add_library (faad2 STATIC IMPORTED)

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ if (USE_FAAD2)`
`226`	`226`	`PATCH_COMMAND patch -p1 -Ni "${CMAKE_SOURCE_DIR}/support/faad2-hdc-support.patch" \|\| exit 0`
`227`	`227`	`COMMAND sh ./bootstrap`
`228`	`228`
`229`		`- CONFIGURE_COMMAND ${FAAD2_PREFIX}/src/faad2_external/configure ${HOST_TRIPLE_ARG} ${FAAD2_CONFIGURE_ARGS} --prefix=${FAAD2_PREFIX} "CFLAGS=-O2 -fPIC ${CMAKE_C_FLAGS}"`
	`229`	`+ CONFIGURE_COMMAND ${FAAD2_PREFIX}/src/faad2_external/configure ${HOST_TRIPLE_ARG} ${FAAD2_CONFIGURE_ARGS} --prefix=${FAAD2_PREFIX} --libdir=${FAAD2_PREFIX}/lib "CFLAGS=-O2 -fPIC ${CMAKE_C_FLAGS}"`
`230`	`230`	`)`
`231`	`231`
`232`	`232`	`add_library (faad2 STATIC IMPORTED)`