Use dynamic implib wrapper for all X11 libs
This commit is contained in:
		
							parent
							
								
									3938a661be
								
							
						
					
					
						commit
						1fcefa4a08
					
				
					 18 changed files with 124 additions and 33 deletions
				
			
		| 
						 | 
				
			
			@ -27,8 +27,11 @@ RUN \
 | 
			
		|||
        -delete && \
 | 
			
		||||
    mkdir /opt/ffbuild
 | 
			
		||||
 | 
			
		||||
RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
 | 
			
		||||
 | 
			
		||||
ADD toolchain.cmake /toolchain.cmake
 | 
			
		||||
ADD cross.meson /cross.meson
 | 
			
		||||
ADD gen-implib.sh /usr/bin/gen-implib
 | 
			
		||||
 | 
			
		||||
ENV PATH="/opt/ct-ng/bin:${PATH}" \
 | 
			
		||||
    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux" \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										17
									
								
								images/base-linux64/gen-implib.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										17
									
								
								images/base-linux64/gen-implib.sh
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,17 @@
 | 
			
		|||
#!/bin/bash
 | 
			
		||||
set -e
 | 
			
		||||
if [[ $# != 2 ]]; then
 | 
			
		||||
    echo "Invalid arguments"
 | 
			
		||||
    exit 1
 | 
			
		||||
fi
 | 
			
		||||
IN="$1"
 | 
			
		||||
OUT="$2"
 | 
			
		||||
 | 
			
		||||
TMPDIR="$(mktemp -d)"
 | 
			
		||||
trap "rm -rf '$TMPDIR'" EXIT
 | 
			
		||||
cd "$TMPDIR"
 | 
			
		||||
 | 
			
		||||
set -x
 | 
			
		||||
python3 /opt/implib/implib-gen.py --target x86_64-linux-gnu --dlopen --lazy-load --verbose "$IN"
 | 
			
		||||
${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -c *.tramp.S *.init.c
 | 
			
		||||
${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue