Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not assume PKG_CONFIG_PATH to be defined. #493

Merged
merged 1 commit into from
Oct 28, 2017
Merged

Do not assume PKG_CONFIG_PATH to be defined. #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/harfbuzz/0.9.40/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/harfbuzz/0.9.41/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/harfbuzz/1.1.2/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/harfbuzz/1.2.1/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/harfbuzz/1.2.6/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/harfbuzz/1.3.0/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/harfbuzz/1.4.2-ft/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function mason_prepare_compile {
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":$PKG_CONFIG_PATH
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
export LIBRARY_PATH="${MASON_FREETYPE}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/protobuf_c/1.1.0/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function mason_prepare_compile {
cd $(dirname ${MASON_ROOT})
${MASON_DIR}/mason install protobuf 2.6.1
MASON_PROTOBUF=$(${MASON_DIR}/mason prefix protobuf 2.6.1)
export PKG_CONFIG_PATH=${MASON_PROTOBUF}/lib/pkgconfig:${PKG_CONFIG_PATH}
export PKG_CONFIG_PATH=${MASON_PROTOBUF}/lib/pkgconfig:${PKG_CONFIG_PATH:-}
}

function mason_compile {
Expand Down