Merge pull request #699 from uyjulian/pkgconfig

Add pkg-config wrapper

Author: fjtrujy

Defs.make

@@ -24,6 +24,7 @@ EE_OBJCOPY ?= $(EE_TOOL_PREFIX)objcopy
 EE_STRIP ?= $(EE_TOOL_PREFIX)strip
 EE_ADDR2LINE ?= $(EE_TOOL_PREFIX)addr2line
 EE_RANLIB ?= $(EE_TOOL_PREFIX)ranlib
+EE_PKG_CONFIG ?= $(EE_TOOL_PREFIX)pkg-config
 
 #
 # Defintions for the IOP toolchain.

samples/Makefile

@@ -6,6 +6,7 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+BIN_TARGET = $(PS2SDK)/bin
 SAMPLES_TARGET = $(PS2SDK)/samples
 SHARE_TARGET = $(PS2DEV)/share
 
@@ -28,7 +29,8 @@ release-samples:
 	cp -f Makefile.eeglobal_cpp_sample $(SAMPLES_TARGET)/Makefile.eeglobal_cpp
 	cp -f Makefile.iopglobal_sample $(SAMPLES_TARGET)/Makefile.iopglobal
 	cp -f ps2dev.cmake $(SHARE_TARGET)/ps2dev.cmake
-	cp -f ps2dev_iop.cmake $(SHARE_TARGET)/ps2dev_iop.cmake
+	cp -f pkg-config.in $(BIN_TARGET)/$(EE_TOOL_PREFIX)pkg-config
+	chmod 755 $(BIN_TARGET)/$(EE_TOOL_PREFIX)pkg-config
 
 release-clean:
 	rm -f -r $(SAMPLES_TARGET)

samples/pkg-config.in

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+command -v pkg-config >/dev/null 2>&1 || { printf >&2 "pkg-config is not found\n"; exit 1; }
+
+# Ensure host libraries are not being used
+
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_PATH=
+export PKG_CONFIG_SYSROOT_DIR=
+
+export PKG_CONFIG_LIBDIR=${PS2SDK}/ports/lib/pkgconfig:${PS2DEV}/gsKit/lib/pkgconfig:${PS2SDK}/ee/lib/pkgconfig
+
+test "$1" = '--version' && exec pkg-config "$@"
+exec pkg-config --static "$@"

samples/ps2dev.cmake

@@ -48,6 +48,11 @@ SET(CMAKE_EXE_LINKER_FLAGS_INIT ${EE_LDFLAGS})
 
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostartfiles -Wl,-r -Wl,-d")
 
+find_program(PKG_CONFIG_EXECUTABLE NAMES mips64r5900el-ps2-elf-pkg-config HINTS "$ENV{PS2SDK}/bin")
+if (NOT PKG_CONFIG_EXECUTABLE)
+    message(FATAL_ERROR "Could not find mips64r5900el-ps2-elf-pkg-config")
+endif()
+
 SET(PS2 TRUE)
 SET(PLATFORM_PS2 TRUE)
 SET(EE TRUE)