(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
This commit is contained in:
		@@ -793,7 +793,8 @@ make_cflags_and_ldflags() {
 | 
				
			|||||||
		if [ "$enable_static" != "0" ]; then
 | 
							if [ "$enable_static" != "0" ]; then
 | 
				
			||||||
			if [ "$os" = "OSX" ]; then
 | 
								if [ "$os" = "OSX" ]; then
 | 
				
			||||||
				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 | 
									# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 | 
				
			||||||
				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
 | 
									# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
 | 
				
			||||||
 | 
									LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`"
 | 
				
			||||||
			else
 | 
								else
 | 
				
			||||||
				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 | 
									LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 | 
				
			||||||
			fi
 | 
								fi
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user