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

Jump to bottom

qscintilla2, octave: bottle for ARM #69653

Closed
wants to merge 2 commits into from
Closed

qscintilla2, octave: bottle for ARM #69653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f1e06e
qscintilla2: bottle for ARM
carlocab Jan 24, 2021
dd4de25
octave: bump revision (qscintilla2)
carlocab Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Formula/octave.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Octave < Formula
mirror "https://ftpmirror.gnu.org/octave/octave-6.1.0.tar.xz"
sha256 "d6cd6b79ef023e300b9287b56aa79333cfb6b651771d43ade7cbde63ca5a6010"
license "GPL-3.0-or-later"
revision 1
revision 2

livecheck do
url :stable
Expand Down
24 changes: 24 additions & 0 deletions Formula/qscintilla2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Qscintilla2 < Formula
url "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.6/QScintilla-2.11.6.tar.gz"
sha256 "e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7"
license "GPL-3.0-only"
revision 1

livecheck do
url "https://www.riverbankcomputing.com/software/qscintilla/download"
Expand All @@ -22,8 +23,14 @@ class Qscintilla2 < Formula
depends_on "qt"
depends_on "sip"

# Fix for rpath in library install name. Taken from
# https://github.com/macports/macports-ports/pull/7790
# https://www.riverbankcomputing.com/pipermail/qscintilla/2020-March/001444.html
patch :DATA

def install
spec = (ENV.compiler == :clang) ? "macx-clang" : "macx-g++"
spec << "-arm64" if Hardware::CPU.arm?
args = %W[-config release -spec #{spec}]

cd "Qt4Qt5" do
Expand Down Expand Up @@ -79,3 +86,20 @@ def install
system Formula["python@3.9"].opt_bin/"python3", "test.py"
end
end

__END__
diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
index 35b37da..7953c1b 100644
--- a/Qt4Qt5/qscintilla.pro
+++ b/Qt4Qt5/qscintilla.pro
@@ -37,10 +37,6 @@ CONFIG(debug, debug|release) {
TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
}

-macx:!CONFIG(staticlib) {
- QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
-}
-
INCLUDEPATH += . ../include ../lexlib ../src

!CONFIG(staticlib) {