Bug 209163 - x11-toolkits/linux-c6-qt47-x11 and graphics/linux-c6-glx-utils RUN_DEPENDS missing USE_LINUX variable
Summary: x11-toolkits/linux-c6-qt47-x11 and graphics/linux-c6-glx-utils RUN_DEPENDS mi...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tijl Coosemans
URL:
Keywords: needs-qa, patch-ready
Depends on:
Blocks:
 
Reported: 2016-04-30 11:45 UTC by marc.priggemeyer
Modified: 2016-09-06 13:44 UTC (History)
1 user (show)

See Also:
xmj: maintainer-feedback+


Attachments
Unified diff for graphics/linux-c6-glx-utils/Makefile (586 bytes, patch)
2016-04-30 11:45 UTC, marc.priggemeyer
no flags Details | Diff
Unified diff for x11-toolkits/linux-c6-qt47-x11 (641 bytes, patch)
2016-04-30 11:46 UTC, marc.priggemeyer
no flags Details | Diff
New unified diff for graphics/linux-c6-glx-utils/Makefile (586 bytes, patch)
2016-05-03 10:00 UTC, marc.priggemeyer
no flags Details | Diff
log from pourdriere testport run for graphics/linux-c6-glx-utils (24.01 KB, text/x-log)
2016-05-03 10:01 UTC, marc.priggemeyer
no flags Details
New unified diff for x11-toolkits/linux-c6-qt47-x11/Makefile (641 bytes, patch)
2016-05-03 10:01 UTC, marc.priggemeyer
no flags Details | Diff
log from poudriere testport for x11-toolkits/linux-c6-qt47-x11 (32.88 KB, text/x-log)
2016-05-03 10:02 UTC, marc.priggemeyer
no flags Details
New unified diff for graphics/linux-c6-glx-utils/Makefile (645 bytes, patch)
2016-05-03 10:04 UTC, marc.priggemeyer
no flags Details | Diff
New unified diff for x11-toolkits/linux-c6-qt47-x11/Makefile (682 bytes, patch)
2016-05-03 10:06 UTC, marc.priggemeyer
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description marc.priggemeyer 2016-04-30 11:45:25 UTC
Created attachment 169824 [details]
Unified diff for graphics/linux-c6-glx-utils/Makefile

While using Poudriere to build linux-c6 with 
OVERRIDE_LINUX_BASE_PORT=c6_64
OVERRIDE_LINUX_NONBASE_PORTS=c6_64
in make.conf the following error messages are generated:

"===>   linux-c6_64-qt47-x11-4.7.2_1 depends on package: linux-c6-libGLU>0 - not found"
"===>   linux-c6_64-glx-utils-10.4.3 depends on package: linux-c6-libGLU>0 - not found"

To correctly distinguish between 32bit and 64bit builds the RUN_DEPENDS declarations need to have the USE_LINUX variable used for dependency specification.

See attached unified diffs for the Makefiles of both ports.
Comment 1 marc.priggemeyer 2016-04-30 11:46:19 UTC
Created attachment 169825 [details]
Unified diff for x11-toolkits/linux-c6-qt47-x11
Comment 2 Johannes Jost Meixner freebsd_committer freebsd_triage 2016-05-01 23:31:00 UTC
Thanks for submitting it, your patch clearly works.

I'll take a look if there isn't a way to leverage the ports framework's options glue to see if you can do something like

NVIDIA_GL_USE_LINUX_APPS+= libglu

Thanks,
Johannes
Comment 3 marc.priggemeyer 2016-05-02 09:58:24 UTC
(In reply to Johannes Jost Meixner from comment #2)
> leverage the ports framework's options glue

That's beyond my knowledge, I fear. But nevertheless a good idea to have a more ports-centric mechanism to add features.
Comment 4 Johannes Jost Meixner freebsd_committer freebsd_triage 2016-05-02 14:22:49 UTC
(In reply to marc.priggemeyer from comment #3)
Can you try the following please (exemplary for glx-utils)?

NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
NVIDIA_GL_VARS=   USE_LINUX_APPS+=libglu

Thanks to mat@ I now know that ${opt}_VARS allows to set custom variables, and USE_LINUX_APPS provides the abstraction for the RUN_DEPENDS we set conditionally for NVIDIA_GL.
Comment 5 marc.priggemeyer 2016-05-02 16:58:15 UTC
(In reply to Johannes Jost Meixner from comment #4)
Here's the output generated by poudriere:
===>   linux-c6_64-glx-utils-10.4.3 depends on file: /compat/linux/usr/lib64/libGLU.so.1 - not found
===>   Installing existing package /packages/All/linux-c6_64-libGLU-10.4.3.txz

Build process was successful with those settings.
Comment 6 Johannes Jost Meixner freebsd_committer freebsd_triage 2016-05-03 01:25:51 UTC
(In reply to marc.priggemeyer from comment #5)
Great. Would you mind attaching the new diffs and the runs of poudriere testport, please?
Comment 7 marc.priggemeyer 2016-05-03 10:00:03 UTC
(In reply to Johannes Jost Meixner from comment #6)
Please see the attachments. I'm wondering about these lines:

"It looks like the /compat/linux/usr/lib64/libGLU.so.1:/usr/ports/graphics/linux-c6-libGLU depends line has an absolute port origin, make sure to remove ${PORTSDIR}/ from it."

It appears that in Mk/bsd.linux-apps.mk ${PORTSDIR} is prepended to all linux ports dependencies. For a test (see below), removing it once from the line for the libGLU dependency results in a successful build and no warning message. Could ${PORTSDIR}/ they be removed for all of them or is there some edge case I did not notice that might break everything?

Change
libglu_PORT=            ${PORTSDIR}/graphics/linux${LINUX_BASEPORT_NAME}-libGLU
to
libglu_PORT=            graphics/linux${LINUX_BASEPORT_NAME}-libGLU
in Mk/bsd.linux-apps.mk

(New ticket, btw.?)
Comment 8 marc.priggemeyer 2016-05-03 10:00:39 UTC
Created attachment 169908 [details]
New unified diff for graphics/linux-c6-glx-utils/Makefile
Comment 9 marc.priggemeyer 2016-05-03 10:01:14 UTC
Created attachment 169909 [details]
log from pourdriere testport run for graphics/linux-c6-glx-utils
Comment 10 marc.priggemeyer 2016-05-03 10:01:55 UTC
Created attachment 169910 [details]
New unified diff for x11-toolkits/linux-c6-qt47-x11/Makefile
Comment 11 marc.priggemeyer 2016-05-03 10:02:20 UTC
Created attachment 169911 [details]
log from poudriere testport for x11-toolkits/linux-c6-qt47-x11
Comment 12 marc.priggemeyer 2016-05-03 10:04:54 UTC
Created attachment 169912 [details]
New unified diff for graphics/linux-c6-glx-utils/Makefile
Comment 13 marc.priggemeyer 2016-05-03 10:06:07 UTC
Created attachment 169913 [details]
New unified diff for x11-toolkits/linux-c6-qt47-x11/Makefile
Comment 14 commit-hook freebsd_committer freebsd_triage 2016-09-06 13:42:25 UTC
A commit references this bug:

Author: tijl
Date: Tue Sep  6 13:42:20 UTC 2016
New revision: 421428
URL: https://svnweb.freebsd.org/changeset/ports/421428

Log:
  Use infrastructure to depend on Linux libGLU.

  PR:		209163
  Submitted by:	marc.priggemeyer@gmail.com

Changes:
  head/graphics/linux-c6-glx-utils/Makefile
  head/x11-toolkits/linux-c6-qt47-x11/Makefile