diff options
| author | bartus | 2020-05-28 16:06:12 +0200 |
|---|---|---|
| committer | bartus | 2020-05-30 09:18:26 +0200 |
| commit | dcbdc95c5e81a60cd98712ece43efc12d0dffe65 (patch) | |
| tree | 1844b023dbd36f907f16bbdd42379c527cae71b0 /rpath.patch | |
| parent | 31e8ecc3797cf78a1c8da32616d574de3138996e (diff) | |
| download | aur-dcbdc95c5e81a60cd98712ece43efc12d0dffe65.tar.gz | |
Switch to cmake build system.
Diffstat (limited to 'rpath.patch')
| -rw-r--r-- | rpath.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/rpath.patch b/rpath.patch deleted file mode 100644 index 393c609b9988..000000000000 --- a/rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro ---- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000 -+++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000 -@@ -130,11 +130,11 @@ - #} - - linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU --linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU --linux-g++-64:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - - # uncomment in your local copy only in emergency cases. - # We should never be too permissive -diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro ---- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100 -+++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000 -@@ -26,11 +26,11 @@ - win32-msvc2010: LIBS += -L../distrib -lcommon - win32-g++: LIBS += -L../distrib -lcommon - linux-g++: LIBS += -L../distrib -lcommon --linux-g++:QMAKE_RPATHDIR += ../distrib -+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-32: LIBS += -L../distrib -lcommon --linux-g++-32:QMAKE_RPATHDIR += ../distrib -+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - linux-g++-64: LIBS += -L../distrib -lcommon --linux-g++-64:QMAKE_RPATHDIR += ../distrib -+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,/usr/lib/meshlab - #CONFIG (release,debug | release) { - # win32-msvc2005:release: LIBS += -L../common/release -lcommon - # win32-msvc2008:release: LIBS += -L../common/release -lcommon |