Skip to content

Commit

Permalink
Increase pckconf version
Browse files Browse the repository at this point in the history
  • Loading branch information
fjtrujy committed Oct 27, 2021
1 parent 58fcc05 commit b14d357
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install dependencies
run: |
apk add build-base bash git python3 py3-pip cmake m4 pkgconfig libarchive-tools libarchive-dev openssl-dev gpgme-dev \
curl-dev asciidoc asciidoctor
curl-dev asciidoc asciidoctor autoconf automake libtool
- name: Compile PKGConf
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM $BASE_DOCKER_IMAGE
COPY . /src

RUN apk add build-base bash git python3 py3-pip cmake m4 pkgconfig libarchive-tools libarchive-dev openssl-dev gpgme-dev \
curl-dev asciidoc asciidoctor
curl-dev asciidoc asciidoctor autoconf automake libtool
RUN cd /src && ./build-all.sh

# Second stage of Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion pspdev.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SET(CMAKE_EXE_LINKER_FLAGS_INIT "-L$ENV{PSPDEV}/lib -L$ENV{PSPDEV}/psp/lib -L$EN
#SET(CMAKE_SHARED_LINKER_FLAGS_INIT "...")
#SET(CMAKE_STATIC_LINKER_FLAGS_CONFIG_INIT "...")
#SET(CMAKE_STATIC_LINKER_FLAGS_INIT "...")
SET(CMAKE_TARGET_INSTALL_PREFIX $ENV{PSPDEV}/psp/sdk)
SET(CMAKE_TARGET_INSTALL_PREFIX $ENV{PSPDEV}/psp/)

SET(CMAKE_FIND_ROOT_PATH $ENV{PSPDEV} $ENV{PSPDEV}/psp $ENV{PSPDEV}/psp/sdk)
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
Expand Down
32 changes: 32 additions & 0 deletions scripts/001-pkgconf.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
# pkgconf.sh by fjtrujy

## Download the source code.
REPO_URL="https://github.com/pkgconf/pkgconf"
REPO_FOLDER="pkgconf"
BRANCH_NAME="pkgconf-1.8.0"
if test ! -d "$REPO_FOLDER"; then
git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || { exit 1; }
else
cd $REPO_FOLDER && git fetch origin && git reset --hard origin/${BRANCH_NAME} || { exit 1; }
fi

TARGET="psp"
TARG_XTRA_OPTS=""

# Configure the build.
./autogen.sh
./configure \
--quiet \
--prefix="$PSPDEV" \
--program-prefix="$TARGET-" \
$TARG_XTRA_OPTS || { exit 1; }

# Compile and install.
make --quiet -j $PROC_NR clean || { exit 1; }
make --quiet -j $PROC_NR || { exit 1; }
make --quiet -j $PROC_NR install-strip || { exit 1; }
make --quiet -j $PROC_NR clean || { exit 1; }

# Create a symbolic link because some project search by psp-pkg-confif
ln -sf "$PSPDEV/bin/psp-pkgconf" "$PSPDEV/bin/psp-pkg-config" || { exit 1; }
21 changes: 0 additions & 21 deletions scripts/001-psp-pkgconf.sh

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/003-pspcmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# pspcmake.sh by fjtrujy

## Compile and install.
mkdir -p PSPDEV/psp/share || { exit 1; }
mkdir -p $PSPDEV/psp/share || { exit 1; }
cp ../pspdev.cmake $PSPDEV/psp/share/pspdev.cmake || { exit 1; }

0 comments on commit b14d357

Please sign in to comment.