Differential D25776

Fixed system lib paths getting hardcoded
ClosedPublic
Actions

Authored by maxrd2 on Dec 5 2019, 11:07 PM.

Details

Reviewers
vonreth
Group Reviewers
Craft
Commits
R877:3d1b09036213: Fixed system lib paths getting hardcoded
Summary

Craft recipes that depend on qt5 fail on non-debian based linux systems with:

g++ -m64 -Wl,--no-undefined -Wl,--version-script,QtSvg.version -Wl,--enable-new-dtags -Wl,-z,origin -Wl,-rpath,\$ORIGIN -Wl,-rpath,\$ORIGIN -shared -Wl,-Bsymbolic-functions -Wl,-soname,libQt5Svg.so.5 -o libQt5Svg.so.5.13.2 .obj/qsvggraphics.o .obj/qsvghandler.o .obj/qsvgnode.o .obj/qsvgstructure.o .obj/qsvgstyle.o .obj/qsvgfont.o .obj/qsvgtinydocument.o .obj/qsvgrenderer.o .obj/qsvgwidget.o .obj/qgraphicssvgitem.o .obj/qsvggenerator.o .obj/moc_qsvgwidget.o  -L/usr/X11R6/lib64 -L/home/max/projects/KDE/craft/lib /home/max/projects/KDE/craft/lib/libQt5Widgets.so /home/max/projects/KDE/craft/lib/libQt5Gui.so /home/max/projects/KDE/craft/lib/libQt5Core.so -lpthread -llibGL.so /home/max/projects/KDE/craft/lib/libz.so   
/bin/ld: cannot find -llibGL.so
collect2: error: ld returned 1 exit status

This change does regexp replace so instead of '-llibGL.so' linker is invoked with '-lGL'

Diff Detail

Repository
R877 Craft Blueprints for KDE
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
maxrd2 requested review of this revision.Dec 5 2019, 11:07 PM
maxrd2 created this revision.
maxrd2 edited the summary of this revision. (Show Details)Dec 5 2019, 11:08 PM
vonreth accepted this revision.Dec 6 2019, 8:46 AM
This revision is now accepted and ready to land.Dec 6 2019, 8:46 AM
maxrd2 added a comment.Dec 6 2019, 10:35 AM

@vonreth I believe I don't have permissions to land this patch.

Closed by commit R877:3d1b09036213: Fixed system lib paths getting hardcoded (authored by maxrd2, committed by vonreth). · Explain WhyDec 6 2019, 12:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mlibs/qt5/qtbase/qtbase.py (2 lines)

Diff 71007

View Options

libs/qt5/qtbase/qtbase.py

Loading...