Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Remove Darwin specific logic - Closes #317 #318

Merged
merged 1 commit into from
Aug 9, 2018

Conversation

fchavant
Copy link
Contributor

@fchavant fchavant commented Aug 7, 2018

No description provided.

abelboldu
abelboldu previously approved these changes Aug 7, 2018
build.sh Outdated
@@ -59,10 +59,7 @@ cd src || exit 2

echo "Building libreadline7"
echo "--------------------------------------------------------------------------"
if [ ! -f "$LIBREADLINE_FILE" ] && [ ! "$(uname -s)" == "Darwin" ]; then
exec_cmd "wget $LIBREADLINE_URL -O $LIBREADLINE_FILE"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still need this guy

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the wget I mean :)

Copy link
Contributor

@Nazgolze Nazgolze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing a wget

@fchavant fchavant force-pushed the 317-discontinue-darwin-buils branch from e393460 to 19eef3b Compare August 9, 2018 08:45
@fchavant fchavant dismissed Nazgolze’s stale review August 9, 2018 08:46

Made the requested changes

Copy link
Contributor

@Nazgolze Nazgolze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, I almost missed this.
postgres, we need to force it to link against the packaged libreadline7

(the evil ! "$(uname -s) == "Darwin" lines )

@fchavant fchavant force-pushed the 317-discontinue-darwin-buils branch from 19eef3b to fb077c3 Compare August 9, 2018 08:59
build.sh Outdated
@@ -151,10 +144,6 @@ if [ ! -d "$BUILD_NAME/node_modules" ]; then
# Copy jq to binary folder
exec_cmd "cp -vf $JQ_DIR/$JQ_OUT $BUILD_NAME/bin/$JQ_OUT"

if [ ! "$(uname -s)" == "Darwin" ]; then
exec_cmd "cp -vf $LIBREADLINE_DIR/out/lib/* $BUILD_NAME/lib"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one too. This is all of them

@fchavant fchavant force-pushed the 317-discontinue-darwin-buils branch from fb077c3 to d303b37 Compare August 9, 2018 10:01
@fchavant fchavant dismissed Nazgolze’s stale review August 9, 2018 10:22

Changes made.

@Nazgolze Nazgolze merged commit 6715183 into 1.0.0 Aug 9, 2018
@Nazgolze Nazgolze deleted the 317-discontinue-darwin-buils branch August 9, 2018 12:06
@Nazgolze Nazgolze mentioned this pull request Aug 9, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants