Granite

Support installing on RPM multilib OSes by using ${LIB_SUFFIX}

Bug #1156975 reported by Michel Lind
18
This bug affects 2 people
Affects Status Importance Assigned to Milestone
Granite
Fix Released
Medium
Corentin Noël

Bug Description

On multilib distributions (RHEL/Fedora, Mandriva/Mageia, probably others) 64-bit libraries are installed in /usr/lib64 instead of /usr/lib. In Fedora, at least, our build system have a predefined macro for invoking cmake that automatically passes the proper flags to cmake, and the libdir issue is handled by setting LIB_SUFFIX.

To handle this case, references to lib in install targets should be changed to lib${LIB_SUFFIX} -- this will be a no-op if LIB_SUFFIX is not defined.

Attached are patches for trunk and for the 0.1 branch.

Related branches

lp:~elementary-pantheon/granite/fix-1156975
xapantu (community): Disapprove
Cody Garver (community): Needs Information
Pim Vullers (community): Approve
David Gomes (community): Needs Information
Rico Tzschichholz: Pending requested
Diff: 33 lines (+3/-3)
2 files modified
lib/CMakeLists.txt (+2/-2)
lib/granite.pc.cmake (+1/-1)
lp:~kazade/granite/lib-suffix
Revision history for this message
Michel Lind (michel-slm) wrote :
Revision history for this message
Michel Lind (michel-slm) wrote :
Cody Garver (codygarver)
Changed in granite:
milestone: none → luna-beta2
importance: Undecided → Medium
status: New → In Progress
assignee: nobody → Michel Alexandre Salim (hircus)
Revision history for this message
Michel Lind (michel-slm) wrote :

Hi Cody,

Thanks! I'm not that familiar with the Bzr workflow, next time I'll push the fix to a private branch as you just did.

Will Luna Beta2 be using granite trunk, instead of 0.x?

Revision history for this message
Cody Garver (codygarver) wrote :

Granite trunk will be merged into 0.x, 0.x is the current stable release.

Here's the basic workflow:

bzr branch lp:granite
cd granite
# make some changes
bzr commit -m "I made some changes."
# make more changes that fix a bug
bzr commit -m "I made some changes that fixed bug #XXXXXX." --fixes=lp:XXXXXX
bzr push lp:~hircus/granite/fix-XXXXXX
# visit code.launchpad.net/~hircus/granite/fix-XXXXXX and propose for merge

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Submitting fixes is covered in full in http://tiny.cc/dev-guide-draft

Cody Garver (codygarver)
Changed in granite:
milestone: luna-beta2 → luna-beta3
Revision history for this message
Cameron Norman (cameronnemo) wrote :

Can somebody take a look at bug 1199965 to see if it is a duplicate of this? I am too much of a dufus to tell.

Revision history for this message
Kazade (kazade) wrote :

As the author of the other one... yes it is a dupe :)

Revision history for this message
Kazade (kazade) wrote :

The simple change in my branch seems to be enough, here's the contents of install_manifest.txt after running with -DLIB_SUFFIX=64 and after installation everything works (I've successfully compiled Scratch)

/usr/lib64/pkgconfig/granite.pc
/usr/share/vala/vapi/granite.vapi
/usr/share/vala/vapi/granite.deps
/usr/include/granite/granite.h
/usr/include/granite/widgets-utils.h
/usr/lib64/libgranite.so.1.0.1
/usr/lib64/libgranite.so.1
/usr/lib64/libgranite.so
/usr/share/gir-1.0/Granite-1.0.gir
/usr/lib64/girepository-1.0/Granite-1.0.typelib
/usr/bin/granite-demo
/usr/share/locale/sl/LC_MESSAGES/granite.mo
/usr/share/locale/fi/LC_MESSAGES/granite.mo
/usr/share/locale/sma/LC_MESSAGES/granite.mo

.... lots more /usr/share/locale stuff

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Trunk revision 576 does something similar and we need to know if that fixes the issue and/or supersedes the proposed patch.

Changed in granite:
status: In Progress → Incomplete
Cody Garver (codygarver)
Changed in granite:
milestone: isis-beta1 → none
Revision history for this message
Corentin Noël (tintou) wrote :

Fixed in rev. 689

Changed in granite:
assignee: Michel Alexandre Salim (michel-slm) → Corentin Noël (tintou)
status: Incomplete → Fix Committed
Danielle Foré (danrabbit)
Changed in granite:
milestone: none → freya-0.3.1
Revision history for this message
Cody Garver (codygarver) wrote :

Revision 689 was a long time ago

Changed in granite:
milestone: freya-0.3.1 → none
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.