Account for fixed bortli buildsystem
This commit is contained in:
		
							parent
							
								
									12473a216f
								
							
						
					
					
						commit
						b1fcac316e
					
				
					 1 changed files with 2 additions and 16 deletions
				
			
		| 
						 | 
					@ -13,22 +13,8 @@ ffbuild_dockerbuild() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mkdir build && cd build
 | 
					    mkdir build && cd build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
 | 
					    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
 | 
				
			||||||
 | 
					        -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF ..
 | 
				
			||||||
    ninja -j$(nproc)
 | 
					    ninja -j$(nproc)
 | 
				
			||||||
    ninja install
 | 
					    ninja install
 | 
				
			||||||
 | 
					 | 
				
			||||||
    # Build system is severely lacking in options, clean up after it
 | 
					 | 
				
			||||||
    rm -r "${FFBUILD_PREFIX}"/bin
 | 
					 | 
				
			||||||
    mv "${FFBUILD_PREFIX}"/lib/libbrotlienc{-static,}.a
 | 
					 | 
				
			||||||
    mv "${FFBUILD_PREFIX}"/lib/libbrotlidec{-static,}.a
 | 
					 | 
				
			||||||
    mv "${FFBUILD_PREFIX}"/lib/libbrotlicommon{-static,}.a
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if [[ $TARGET == win* ]]; then
 | 
					 | 
				
			||||||
        rm "${FFBUILD_PREFIX}"/lib/libbrotli*.dll.a
 | 
					 | 
				
			||||||
    elif [[ $TARGET == linux* ]]; then
 | 
					 | 
				
			||||||
        rm "${FFBUILD_PREFIX}"/lib/libbrotli*.so*
 | 
					 | 
				
			||||||
    else
 | 
					 | 
				
			||||||
        echo "Unknown target"
 | 
					 | 
				
			||||||
        return -1
 | 
					 | 
				
			||||||
    fi
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue