Skip to content

Commit

Permalink
qwt re-link appears no longer necessary after QWT_INSTALL_PREFIX blud…
Browse files Browse the repository at this point in the history
…geoning
  • Loading branch information
dholl committed May 4, 2017
1 parent e1c2b81 commit 4030fc2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 29 deletions.
16 changes: 0 additions & 16 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1476,12 +1476,6 @@ URL=https://cytranet.dl.sourceforge.net/project/qwt/qwt/6.1.3/qwt-6.1.3.tar.bz2
T=${P}
BRANCH=""

SHOULD_DO_REBUILD=""

if [ ! -f ${TMP_DIR}/.${P}.done ]; then
SHOULD_DO_REBUILD="yes"
fi

QMAKE_CXX="${CXX}" \
QMAKE_CXXFLAGS="${CPPFLAGS}" \
QMAKE_LFLAGS="${LDFLAGS}" \
Expand All @@ -1492,16 +1486,6 @@ build_and_install_qmake \
${T} \
${BRANCH}

if [ "yes" = "${SHOULD_DO_REBUILD}" ]; then
cd ${TMP_DIR}/${T} \
&& I re-doing final link because qwt does not respect QMAKE_LFLAGS_SONAME \
&& git apply ${BUILD_DIR}/patches/qwt-bullshit.diff \
&& rm lib/* \
&& ${MAKE} \
&& ${MAKE} install \
|| E failed to build and install ${P}
fi

#
# Install sip
#
Expand Down
13 changes: 0 additions & 13 deletions patches/qwt-bullshit.diff

This file was deleted.

0 comments on commit 4030fc2

Please sign in to comment.