xorg: fix installation paths (branch yem/xorg)

RFC PATCH New Yann E. MORIN 3 participants 10 messages Nov 1, 2015 – Nov 2, 2015 Arm i.MX and Layerscape

lore

Share & tools

lore

Yann E. MORIN

author

2015-11-01 23:00 UTC #0 lore raw

cover xorg: fix installation paths (branch yem/xorg)

Hello All!

This series is an attempt to fix the installation paths of many Xorg-related packages.

*This is an RFC.* There is an alternate proposal after the explanations on the series.

The new pkconf bumped in d7f6d320 introduced a change in behaviour: all path variables returned by pkgconf are now prefixed with the sysroot directory.

This has an impact on a lot of Xorg packages (and maybe others as well), since they use such paths verbatim to install files in either of:

    $(STAGING_DIR)/$(SYSROOT_DIR)/some/path
    $(TARGET_DIR)/$(SYSROOT_DIR)/some/path

This series is articulated around two main changes:

- first, we fix the Xorg packages to no longer use those paths as-is, by removing the sysroot from select paths returned by pkgconf. We do that in two steps:

- we introduce a new variable, X11R7_CONF_OPTS, which contains a set of --with-XXX options with fixed paths,

- we append the content that variable to all Xorg related packages' ./configure options;

- second, we introduce a new step hook, that checks that no package installs files in either problematic locations:

- we allow step hooks to properly abort a step, by calling them before we touch our stamp files,

- we eventually add the new step hook proper, and exit as soon as we detect an incorrect location, printing an error message to inform the user of the issue.

I've done a build with most of the Xorg stack enabled (but 8 video drivers that FTBFS for other reasons), and it all went well with this series.

To be honest, I've spent a lot of time this WE to come up with this series. However, all that series shows, is how deeply broken our pkg-config support is now and how complex it will be to fix properly.

The only part of the series that I'd like see committed are the last two patches. The first two patches are just to demonstrate how much changes we'll have to do to fix things. Only the Xorg stack has been fixed here; probably many other packages are bound to fail in the same way.

Note: we have 245 packages in package/x11r7, and changing only the broken ones is a tedious task, and very time-consuming. After trying to fix 5 or 6 packages, each with various build failures, I just reverted to the solution above (patches 1 & 2).

------------------------------------
Alternate proposal:

We revert d7f6d320 (pkgconf: bump to version 0.9.12). Since that would break nettle's install hogweed.pc, since it has in-lined comments. This is what (at least partially) prompted the pkconf bump initially.

The solution would be to fixup .pc files, like we do fixup .la files, at the end of the staging install commands, to remove comments from .pc files.
------------------------------------

Needless to say, I'd be more than happy to ditch the first two patches in this series and work on the alternate proposal.

Comments most welcome.

Regards,
Yann E. MORIN.

The following changes since commit dc3935ea1d3553591438211ec8b6072429ac7e60:

linux: Add zImage.epapr target (2015-10-31 19:01:21 +0100)

are available in the git repository at:

git://git.busybox.net/~ymorin/git/buildroot yem/xorg

for you to fetch changes up to ef39f35c76cbac03be14009c1a8db59d7e3f59e3:

core/pkg-generic: check proper package installation (2015-11-01 23:03:42 +0100)

----------------------------------------------------------------
Yann E. MORIN (4):
package/x11r7: introduce X11-global configure options package/x11r7/*: fixup all install paths core/pkg-generic: allow step hooks to fail a step core/pkg-generic: check proper package installation

 package/pkg-generic.mk                             | 31 ++++++++++++++++------
 package/x11r7/libepoxy/libepoxy.mk                 |  3 +++
 package/x11r7/libxcb/libxcb.mk                     |  3 +++
 package/x11r7/x11r7.mk                             | 16 +++++++++++
 package/x11r7/xapp_appres/xapp_appres.mk           |  3 +++
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk       |  3 +++
 package/x11r7/xapp_beforelight/xapp_beforelight.mk |  3 +++
 package/x11r7/xapp_bitmap/xapp_bitmap.mk           |  3 +++
 package/x11r7/xapp_editres/xapp_editres.mk         |  3 +++
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk   |  3 +++
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk     |  3 +++
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk         |  3 +++
 package/x11r7/xapp_iceauth/xapp_iceauth.mk         |  3 +++
 package/x11r7/xapp_ico/xapp_ico.mk                 |  3 +++
 package/x11r7/xapp_listres/xapp_listres.mk         |  3 +++
 package/x11r7/xapp_luit/xapp_luit.mk               |  3 +++
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk     |  3 +++
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk |  3 +++
 package/x11r7/xapp_oclock/xapp_oclock.mk           |  3 +++
 package/x11r7/xapp_rgb/xapp_rgb.mk                 |  3 +++
 package/x11r7/xapp_rstart/xapp_rstart.mk           |  3 +++
 package/x11r7/xapp_scripts/xapp_scripts.mk         |  3 +++
 package/x11r7/xapp_sessreg/xapp_sessreg.mk         |  3 +++
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk     |  3 +++
 package/x11r7/xapp_showfont/xapp_showfont.mk       |  3 +++
 package/x11r7/xapp_smproxy/xapp_smproxy.mk         |  3 +++
 package/x11r7/xapp_twm/xapp_twm.mk                 |  3 +++
 package/x11r7/xapp_viewres/xapp_viewres.mk         |  3 +++
 package/x11r7/xapp_x11perf/xapp_x11perf.mk         |  3 +++
 package/x11r7/xapp_xauth/xapp_xauth.mk             |  3 +++
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk   |  3 +++
 package/x11r7/xapp_xbiff/xapp_xbiff.mk             |  3 +++
 package/x11r7/xapp_xcalc/xapp_xcalc.mk             |  3 +++
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk   |  3 +++
 package/x11r7/xapp_xclock/xapp_xclock.mk           |  3 +++
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk           |  3 +++
 package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk       |  3 +++
 package/x11r7/xapp_xconsole/xapp_xconsole.mk       |  3 +++
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk   |  3 +++
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk     |  3 +++
 package/x11r7/xapp_xditview/xapp_xditview.mk       |  3 +++
 package/x11r7/xapp_xdm/xapp_xdm.mk                 |  3 +++
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk       |  3 +++
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk       |  3 +++
 package/x11r7/xapp_xedit/xapp_xedit.mk             |  3 +++
 package/x11r7/xapp_xev/xapp_xev.mk                 |  3 +++
 package/x11r7/xapp_xeyes/xapp_xeyes.mk             |  3 +++
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk         |  3 +++
 package/x11r7/xapp_xfd/xapp_xfd.mk                 |  3 +++
 package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk   |  3 +++
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk       |  3 +++
 package/x11r7/xapp_xfs/xapp_xfs.mk                 |  3 +++
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk         |  3 +++
 package/x11r7/xapp_xgamma/xapp_xgamma.mk           |  3 +++
 package/x11r7/xapp_xgc/xapp_xgc.mk                 |  3 +++
 package/x11r7/xapp_xhost/xapp_xhost.mk             |  3 +++
 package/x11r7/xapp_xinit/xapp_xinit.mk             |  3 +++
 .../xapp_xinput-calibrator.mk                      |  3 +++
 package/x11r7/xapp_xinput/xapp_xinput.mk           |  3 +++
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk         |  3 +++
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk           |  3 +++
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk       |  3 +++
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk       |  3 +++
 package/x11r7/xapp_xkill/xapp_xkill.mk             |  3 +++
 package/x11r7/xapp_xload/xapp_xload.mk             |  3 +++
 package/x11r7/xapp_xlogo/xapp_xlogo.mk             |  3 +++
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk       |  3 +++
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk   |  3 +++
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk       |  3 +++
 package/x11r7/xapp_xmag/xapp_xmag.mk               |  3 +++
 package/x11r7/xapp_xman/xapp_xman.mk               |  3 +++
 package/x11r7/xapp_xmessage/xapp_xmessage.mk       |  3 +++
 package/x11r7/xapp_xmh/xapp_xmh.mk                 |  3 +++
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk         |  3 +++
 package/x11r7/xapp_xmore/xapp_xmore.mk             |  3 +++
 package/x11r7/xapp_xpr/xapp_xpr.mk                 |  3 +++
 package/x11r7/xapp_xprop/xapp_xprop.mk             |  3 +++
 package/x11r7/xapp_xrandr/xapp_xrandr.mk           |  3 +++
 package/x11r7/xapp_xrdb/xapp_xrdb.mk               |  3 +++
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk       |  3 +++
 package/x11r7/xapp_xset/xapp_xset.mk               |  3 +++
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk       |  3 +++
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk |  3 +++
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk       |  3 +++
 package/x11r7/xapp_xsm/xapp_xsm.mk                 |  3 +++
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk       |  3 +++
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk       |  3 +++
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk           |  3 +++
 package/x11r7/xapp_xwd/xapp_xwd.mk                 |  3 +++
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk       |  3 +++
 package/x11r7/xapp_xwud/xapp_xwud.mk               |  3 +++
 package/x11r7/xcb-proto/xcb-proto.mk               |  3 +++
 package/x11r7/xcb-util-cursor/xcb-util-cursor.mk   |  3 +++
 package/x11r7/xcb-util-image/xcb-util-image.mk     |  3 +++
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk |  3 +++
 .../xcb-util-renderutil/xcb-util-renderutil.mk     |  3 +++
 package/x11r7/xcb-util-wm/xcb-util-wm.mk           |  3 +++
 package/x11r7/xcb-util/xcb-util.mk                 |  3 +++
 .../xcursor-transparent-theme.mk                   |  3 +++
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk     |  3 +++
 .../xdata_xcursor-themes/xdata_xcursor-themes.mk   |  3 +++
 .../xdriver_xf86-input-evdev.mk                    |  3 +++
 .../xdriver_xf86-input-joystick.mk                 |  3 +++
 .../xdriver_xf86-input-keyboard.mk                 |  3 +++
 .../xdriver_xf86-input-libinput.mk                 |  3 +++
 .../xdriver_xf86-input-mouse.mk                    |  3 +++
 .../xdriver_xf86-input-synaptics.mk                |  3 +++
 .../xdriver_xf86-input-tslib.mk                    |  3 +++
 .../xdriver_xf86-input-vmmouse.mk                  |  3 +++
 .../xdriver_xf86-input-void.mk                     |  3 +++
 .../xdriver_xf86-video-ark.mk                      |  3 +++
 .../xdriver_xf86-video-ast.mk                      |  3 +++
 .../xdriver_xf86-video-ati.mk                      |  3 +++
 .../xdriver_xf86-video-cirrus.mk                   |  3 +++
 .../xdriver_xf86-video-dummy.mk                    |  3 +++
 .../xdriver_xf86-video-fbdev.mk                    |  3 +++
 .../xdriver_xf86-video-fbturbo.mk                  |  3 +++
 .../xdriver_xf86-video-geode.mk                    |  3 +++
 .../xdriver_xf86-video-glide.mk                    |  3 +++
 .../xdriver_xf86-video-glint.mk                    |  3 +++
 .../xdriver_xf86-video-i128.mk                     |  3 +++
 .../xdriver_xf86-video-imx.mk                      |  3 +++
 .../xdriver_xf86-video-intel.mk                    |  3 +++
 .../xdriver_xf86-video-mach64.mk                   |  3 +++
 .../xdriver_xf86-video-mga.mk                      |  3 +++
 .../xdriver_xf86-video-neomagic.mk                 |  3 +++
 .../xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk |  3 +++
 .../xdriver_xf86-video-openchrome.mk               |  3 +++
 .../xdriver_xf86-video-qxl.mk                      |  3 +++
 .../xdriver_xf86-video-r128.mk                     |  3 +++
 .../xdriver_xf86-video-savage.mk                   |  3 +++
 .../xdriver_xf86-video-siliconmotion.mk            |  3 +++
 .../xdriver_xf86-video-sis.mk                      |  3 +++
 .../xdriver_xf86-video-tdfx.mk                     |  3 +++
 .../xdriver_xf86-video-tga.mk                      |  3 +++
 .../xdriver_xf86-video-trident.mk                  |  3 +++
 .../xdriver_xf86-video-v4l.mk                      |  3 +++
 .../xdriver_xf86-video-vesa.mk                     |  3 +++
 .../xdriver_xf86-video-vmware.mk                   |  3 +++
 .../xdriver_xf86-video-voodoo.mk                   |  3 +++
 .../xdriver_xf86-video-wsfb.mk                     |  3 +++
 package/x11r7/xfont_encodings/xfont_encodings.mk   |  3 +++
 .../xfont_font-adobe-100dpi.mk                     |  3 +++
 .../xfont_font-adobe-75dpi.mk                      |  3 +++
 .../xfont_font-adobe-utopia-100dpi.mk              |  3 +++
 .../xfont_font-adobe-utopia-75dpi.mk               |  3 +++
 .../xfont_font-adobe-utopia-type1.mk               |  3 +++
 package/x11r7/xfont_font-alias/xfont_font-alias.mk |  3 +++
 .../xfont_font-arabic-misc.mk                      |  3 +++
 .../xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk   |  3 +++
 .../xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk     |  3 +++
 .../xfont_font-bh-lucidatypewriter-100dpi.mk       |  3 +++
 .../xfont_font-bh-lucidatypewriter-75dpi.mk        |  3 +++
 .../x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk   |  3 +++
 .../xfont_font-bh-type1/xfont_font-bh-type1.mk     |  3 +++
 .../xfont_font-bitstream-100dpi.mk                 |  3 +++
 .../xfont_font-bitstream-75dpi.mk                  |  3 +++
 .../xfont_font-bitstream-type1.mk                  |  3 +++
 .../xfont_font-cronyx-cyrillic.mk                  |  3 +++
 .../xfont_font-cursor-misc.mk                      |  3 +++
 .../xfont_font-daewoo-misc.mk                      |  3 +++
 .../xfont_font-dec-misc/xfont_font-dec-misc.mk     |  3 +++
 .../xfont_font-ibm-type1/xfont_font-ibm-type1.mk   |  3 +++
 .../xfont_font-isas-misc/xfont_font-isas-misc.mk   |  3 +++
 .../xfont_font-jis-misc/xfont_font-jis-misc.mk     |  3 +++
 .../xfont_font-micro-misc/xfont_font-micro-misc.mk |  3 +++
 .../xfont_font-misc-cyrillic.mk                    |  3 +++
 .../xfont_font-misc-ethiopic.mk                    |  3 +++
 .../xfont_font-misc-meltho.mk                      |  3 +++
 .../xfont_font-misc-misc/xfont_font-misc-misc.mk   |  3 +++
 .../xfont_font-mutt-misc/xfont_font-mutt-misc.mk   |  3 +++
 .../xfont_font-schumacher-misc.mk                  |  3 +++
 .../xfont_font-screen-cyrillic.mk                  |  3 +++
 .../xfont_font-sony-misc/xfont_font-sony-misc.mk   |  3 +++
 .../xfont_font-sun-misc/xfont_font-sun-misc.mk     |  3 +++
 package/x11r7/xfont_font-util/xfont_font-util.mk   |  3 +++
 .../xfont_font-winitzki-cyrillic.mk                |  3 +++
 .../xfont_font-xfree86-type1.mk                    |  3 +++
 package/x11r7/xkeyboard-config/xkeyboard-config.mk |  3 +++
 package/x11r7/xlib_libFS/xlib_libFS.mk             |  3 +++
 package/x11r7/xlib_libICE/xlib_libICE.mk           |  3 +++
 package/x11r7/xlib_libSM/xlib_libSM.mk             |  3 +++
 package/x11r7/xlib_libX11/xlib_libX11.mk           |  3 +++
 .../x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk |  3 +++
 package/x11r7/xlib_libXau/xlib_libXau.mk           |  3 +++
 package/x11r7/xlib_libXaw/xlib_libXaw.mk           |  3 +++
 .../x11r7/xlib_libXcomposite/xlib_libXcomposite.mk |  3 +++
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk   |  3 +++
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk   |  3 +++
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk       |  3 +++
 package/x11r7/xlib_libXext/xlib_libXext.mk         |  3 +++
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk     |  3 +++
 package/x11r7/xlib_libXfont/xlib_libXfont.mk       |  3 +++
 package/x11r7/xlib_libXft/xlib_libXft.mk           |  3 +++
 package/x11r7/xlib_libXi/xlib_libXi.mk             |  3 +++
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk |  3 +++
 package/x11r7/xlib_libXmu/xlib_libXmu.mk           |  3 +++
 package/x11r7/xlib_libXpm/xlib_libXpm.mk           |  3 +++
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk     |  3 +++
 package/x11r7/xlib_libXrender/xlib_libXrender.mk   |  3 +++
 package/x11r7/xlib_libXres/xlib_libXres.mk         |  3 +++
 package/x11r7/xlib_libXt/xlib_libXt.mk             |  3 +++
 package/x11r7/xlib_libXtst/xlib_libXtst.mk         |  3 +++
 package/x11r7/xlib_libXv/xlib_libXv.mk             |  3 +++
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk         |  3 +++
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk |  3 +++
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk   |  3 +++
 package/x11r7/xlib_libdmx/xlib_libdmx.mk           |  3 +++
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk   |  3 +++
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk   |  3 +++
 .../x11r7/xlib_libxshmfence/xlib_libxshmfence.mk   |  3 +++
 package/x11r7/xlib_xtrans/xlib_xtrans.mk           |  3 +++
 .../xproto_applewmproto/xproto_applewmproto.mk     |  3 +++
 .../xproto_bigreqsproto/xproto_bigreqsproto.mk     |  3 +++
 .../xproto_compositeproto/xproto_compositeproto.mk |  3 +++
 .../x11r7/xproto_damageproto/xproto_damageproto.mk |  3 +++
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk   |  3 +++
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk |  3 +++
 package/x11r7/xproto_dri3proto/xproto_dri3proto.mk |  3 +++
 .../x11r7/xproto_fixesproto/xproto_fixesproto.mk   |  3 +++
 .../xproto_fontcacheproto/xproto_fontcacheproto.mk |  3 +++
 .../x11r7/xproto_fontsproto/xproto_fontsproto.mk   |  3 +++
 package/x11r7/xproto_glproto/xproto_glproto.mk     |  3 +++
 .../x11r7/xproto_inputproto/xproto_inputproto.mk   |  3 +++
 package/x11r7/xproto_kbproto/xproto_kbproto.mk     |  3 +++
 .../xproto_presentproto/xproto_presentproto.mk     |  3 +++
 .../x11r7/xproto_randrproto/xproto_randrproto.mk   |  3 +++
 .../x11r7/xproto_recordproto/xproto_recordproto.mk |  3 +++
 .../x11r7/xproto_renderproto/xproto_renderproto.mk |  3 +++
 .../xproto_resourceproto/xproto_resourceproto.mk   |  3 +++
 .../xproto_scrnsaverproto/xproto_scrnsaverproto.mk |  3 +++
 .../x11r7/xproto_videoproto/xproto_videoproto.mk   |  3 +++
 .../xproto_windowswmproto/xproto_windowswmproto.mk |  3 +++
 .../x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk |  3 +++
 package/x11r7/xproto_xextproto/xproto_xextproto.mk |  3 +++
 .../xproto_xf86bigfontproto.mk                     |  3 +++
 .../xproto_xf86dgaproto/xproto_xf86dgaproto.mk     |  3 +++
 .../xproto_xf86driproto/xproto_xf86driproto.mk     |  3 +++
 .../xproto_xf86vidmodeproto.mk                     |  3 +++
 .../xproto_xineramaproto/xproto_xineramaproto.mk   |  3 +++
 package/x11r7/xproto_xproto/xproto_xproto.mk       |  3 +++
 .../xproto_xproxymanagementprotocol.mk             |  3 +++
 .../xserver_xorg-server/xserver_xorg-server.mk     |  3 +++
 package/x11r7/xutil_makedepend/xutil_makedepend.mk |  3 +++
 .../x11r7/xutil_util-macros/xutil_util-macros.mk   |  3 +++
 245 files changed, 768 insertions(+), 8 deletions(-)

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Yann E. MORIN

author

2015-11-01 23:00 UTC #1 lore raw

RFC PATCH 1/4 package/x11r7: introduce X11-global configure options

For some reasons (Xorg bump? pkgconf bump?), the Xorg packages end up installing files in $(TARGET_DIR)/$(SYROOT_DIR), like so:

/home/ymorin/dev/buildroot/O/target/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/share/fonts/X11/encodings/

This is because the various ./configure scripts ask pkg-config to get a few variables, like the path to what Xorg calls the 'sdkdir', or the path to the fonts directory.

It then uses those paths verbatim, to install things as:

    $(DESTDIR)/$(sdkdir)

But since pkg-config prepends the sysroot path to all the variables it returns, we end up with such incorrect paths.

Introduce a ./configure option global to all the Xorg packages, that overrides the autodetection, and removes the sysroot dir from such paths.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Gustavo Zacarias <[email protected]>

Cc Bernd Kuhls <[email protected]>

Cc Romain Naour <[email protected]>

---
 package/x11r7/x11r7.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

package/x11r7/x11r7.mk +16 -0

index 85ecbc5..dce6732 100644
@@ -1 +1,17 @@
+# Get an Xorg-related pkg-config variable, and fixup paths,
+# so they do not include the build directory.
+# $(1): pkg-config variable
+# $(2): pkg-config package
+X11R7_PKGCONFIG_VARIABLE = \
+	`$(PKG_CONFIG_HOST_BINARY) --variable=$(1) $(2) \
+	|sed -r -e 's:^$(STAGING_DIR)::'`
+
+X11R7_CONF_OPTS = \
+	--with-xorg-conf-dir=$(call X11R7_PKGCONFIG_VARIABLE,sysconfigdir,xorg-server) \
+	--with-appdefaultdir=$(call X11R7_PKGCONFIG_VARIABLE,appdefaultdir,xt) \
+	--with-fontrootdir=$(call X11R7_PKGCONFIG_VARIABLE,fontrootdir,fontutil) \
+	--with-fc-confdir=$(call X11R7_PKGCONFIG_VARIABLE,confdir,fontconfig) \
+	--with-cursordir=$(call X11R7_PKGCONFIG_VARIABLE,icondir,xcursor) \
+	--with-sdkdir=$(call X11R7_PKGCONFIG_VARIABLE,sdkdir,xorg-server)
+
 include $(sort $(wildcard package/x11r7/*/*.mk))

Signature · 1 line

1.9.1

Yann E. MORIN

author

2015-11-01 23:00 UTC #2 lore raw

RFC PATCH 2/4 package/x11r7/*: fixup all install paths

In reply to Yann E. MORIN

Use the newly-introduced Xorg-wide ./configure option to fixup install paths.

Only two packages are not impacted by this change. Both are generic-packages, and neither is using pkg-config:
- mcookie
- xdriver_xf86-video-imx-viv

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Gustavo Zacarias <[email protected]>

Cc Bernd Kuhls <[email protected]>

Cc Romain Naour <[email protected]>

---
This is a purely mechanical change, obtained with the following script:

$ cat foo.sh

COMMENT="# Fixup incorrect paths"

main() {
    local base_dir="${1}"

    if [ -z "${base_dir}" ]; then
        printf "error, no basedir specified\n" >&2
        exit 1
    fi
    if [ ! -d "${base_dir}" ]; then
        printf "basedir '%s' not a directory\n" "${base_dir}" >&2
        exit 1
    fi

    find "${base_dir}" -type f -name '*.mk' -exec grep -l -E 'eval \$\(autotools' {} + \
    |while read file; do
        pkg="${file##*/}"
        pkg="${pkg%.mk}"
        PKG="$( sed -r -e 's/-/_/g;' <<<"${pkg^^}" )"
        grep -E "^${PKG}_VERSION" "${file}" >/dev/null 2>&1 || continue
        printf "%s\n" "${pkg}"
        PKG_CONF_OPTS="${PKG}_CONF_OPTS += \$(X11R7_CONF_OPTS)"
        sed -r -i -e '/^(\$\(eval \$\(autotools-package\)\))$/s//'"${COMMENT}"'\n'"${PKG_CONF_OPTS}"'\n\n\1/' "${file}"
    done
}

main "${@}"

$ ./foo.sh package/x11r7
---
 package/x11r7/libepoxy/libepoxy.mk                                     | 3 +++
 package/x11r7/libxcb/libxcb.mk                                         | 3 +++
 package/x11r7/xapp_appres/xapp_appres.mk                               | 3 +++
 package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk                           | 3 +++
 package/x11r7/xapp_beforelight/xapp_beforelight.mk                     | 3 +++
 package/x11r7/xapp_bitmap/xapp_bitmap.mk                               | 3 +++
 package/x11r7/xapp_editres/xapp_editres.mk                             | 3 +++
 package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk                       | 3 +++
 package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk                         | 3 +++
 package/x11r7/xapp_fstobdf/xapp_fstobdf.mk                             | 3 +++
 package/x11r7/xapp_iceauth/xapp_iceauth.mk                             | 3 +++
 package/x11r7/xapp_ico/xapp_ico.mk                                     | 3 +++
 package/x11r7/xapp_listres/xapp_listres.mk                             | 3 +++
 package/x11r7/xapp_luit/xapp_luit.mk                                   | 3 +++
 package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk                         | 3 +++
 package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk                     | 3 +++
 package/x11r7/xapp_oclock/xapp_oclock.mk                               | 3 +++
 package/x11r7/xapp_rgb/xapp_rgb.mk                                     | 3 +++
 package/x11r7/xapp_rstart/xapp_rstart.mk                               | 3 +++
 package/x11r7/xapp_scripts/xapp_scripts.mk                             | 3 +++
 package/x11r7/xapp_sessreg/xapp_sessreg.mk                             | 3 +++
 package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk                         | 3 +++
 package/x11r7/xapp_showfont/xapp_showfont.mk                           | 3 +++
 package/x11r7/xapp_smproxy/xapp_smproxy.mk                             | 3 +++
 package/x11r7/xapp_twm/xapp_twm.mk                                     | 3 +++
 package/x11r7/xapp_viewres/xapp_viewres.mk                             | 3 +++
 package/x11r7/xapp_x11perf/xapp_x11perf.mk                             | 3 +++
 package/x11r7/xapp_xauth/xapp_xauth.mk                                 | 3 +++
 package/x11r7/xapp_xbacklight/xapp_xbacklight.mk                       | 3 +++
 package/x11r7/xapp_xbiff/xapp_xbiff.mk                                 | 3 +++
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                                 | 3 +++
 package/x11r7/xapp_xclipboard/xapp_xclipboard.mk                       | 3 +++
 package/x11r7/xapp_xclock/xapp_xclock.mk                               | 3 +++
 package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk                               | 3 +++
 package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk                           | 3 +++
 package/x11r7/xapp_xconsole/xapp_xconsole.mk                           | 3 +++
 package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk                       | 3 +++
 package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk                         | 3 +++
 package/x11r7/xapp_xditview/xapp_xditview.mk                           | 3 +++
 package/x11r7/xapp_xdm/xapp_xdm.mk                                     | 3 +++
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk                           | 3 +++
 package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk                           | 3 +++
 package/x11r7/xapp_xedit/xapp_xedit.mk                                 | 3 +++
 package/x11r7/xapp_xev/xapp_xev.mk                                     | 3 +++
 package/x11r7/xapp_xeyes/xapp_xeyes.mk                                 | 3 +++
 package/x11r7/xapp_xf86dga/xapp_xf86dga.mk                             | 3 +++
 package/x11r7/xapp_xfd/xapp_xfd.mk                                     | 3 +++
 package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk                       | 3 +++
 package/x11r7/xapp_xfontsel/xapp_xfontsel.mk                           | 3 +++
 package/x11r7/xapp_xfs/xapp_xfs.mk                                     | 3 +++
 package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk                             | 3 +++
 package/x11r7/xapp_xgamma/xapp_xgamma.mk                               | 3 +++
 package/x11r7/xapp_xgc/xapp_xgc.mk                                     | 3 +++
 package/x11r7/xapp_xhost/xapp_xhost.mk                                 | 3 +++
 package/x11r7/xapp_xinit/xapp_xinit.mk                                 | 3 +++
 package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk         | 3 +++
 package/x11r7/xapp_xinput/xapp_xinput.mk                               | 3 +++
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk                             | 3 +++
 package/x11r7/xapp_xkbevd/xapp_xkbevd.mk                               | 3 +++
 package/x11r7/xapp_xkbprint/xapp_xkbprint.mk                           | 3 +++
 package/x11r7/xapp_xkbutils/xapp_xkbutils.mk                           | 3 +++
 package/x11r7/xapp_xkill/xapp_xkill.mk                                 | 3 +++
 package/x11r7/xapp_xload/xapp_xload.mk                                 | 3 +++
 package/x11r7/xapp_xlogo/xapp_xlogo.mk                                 | 3 +++
 package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk                           | 3 +++
 package/x11r7/xapp_xlsclients/xapp_xlsclients.mk                       | 3 +++
 package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk                           | 3 +++
 package/x11r7/xapp_xmag/xapp_xmag.mk                                   | 3 +++
 package/x11r7/xapp_xman/xapp_xman.mk                                   | 3 +++
 package/x11r7/xapp_xmessage/xapp_xmessage.mk                           | 3 +++
 package/x11r7/xapp_xmh/xapp_xmh.mk                                     | 3 +++
 package/x11r7/xapp_xmodmap/xapp_xmodmap.mk                             | 3 +++
 package/x11r7/xapp_xmore/xapp_xmore.mk                                 | 3 +++
 package/x11r7/xapp_xpr/xapp_xpr.mk                                     | 3 +++
 package/x11r7/xapp_xprop/xapp_xprop.mk                                 | 3 +++
 package/x11r7/xapp_xrandr/xapp_xrandr.mk                               | 3 +++
 package/x11r7/xapp_xrdb/xapp_xrdb.mk                                   | 3 +++
 package/x11r7/xapp_xrefresh/xapp_xrefresh.mk                           | 3 +++
 package/x11r7/xapp_xset/xapp_xset.mk                                   | 3 +++
 package/x11r7/xapp_xsetmode/xapp_xsetmode.mk                           | 3 +++
 package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk                     | 3 +++
 package/x11r7/xapp_xsetroot/xapp_xsetroot.mk                           | 3 +++
 package/x11r7/xapp_xsm/xapp_xsm.mk                                     | 3 +++
 package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk                           | 3 +++
 package/x11r7/xapp_xvidtune/xapp_xvidtune.mk                           | 3 +++
 package/x11r7/xapp_xvinfo/xapp_xvinfo.mk                               | 3 +++
 package/x11r7/xapp_xwd/xapp_xwd.mk                                     | 3 +++
 package/x11r7/xapp_xwininfo/xapp_xwininfo.mk                           | 3 +++
 package/x11r7/xapp_xwud/xapp_xwud.mk                                   | 3 +++
 package/x11r7/xcb-proto/xcb-proto.mk                                   | 3 +++
 package/x11r7/xcb-util-cursor/xcb-util-cursor.mk                       | 3 +++
 package/x11r7/xcb-util-image/xcb-util-image.mk                         | 3 +++
 package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk                     | 3 +++
 package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk               | 3 +++
 package/x11r7/xcb-util-wm/xcb-util-wm.mk                               | 3 +++
 package/x11r7/xcb-util/xcb-util.mk                                     | 3 +++
 package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk   | 3 +++
 package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk                         | 3 +++
 package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk             | 3 +++
 package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk     | 3 +++
 .../x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk   | 3 +++
 .../x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk   | 3 +++
 .../x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk   | 3 +++
 package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk     | 3 +++
 .../x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk | 3 +++
 package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk     | 3 +++
 package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk | 3 +++
 package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk       | 3 +++
 package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk   | 3 +++
 package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk | 3 +++
 package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk       | 3 +++
 package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk   | 3 +++
 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk         | 3 +++
 .../x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk   | 3 +++
 package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk           | 3 +++
 .../xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk     | 3 +++
 package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk       | 3 +++
 package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk   | 3 +++
 .../xdriver_xf86-video-siliconmotion.mk                                | 3 +++
 package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk       | 3 +++
 package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk | 3 +++
 package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk         | 3 +++
 package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk       | 3 +++
 package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk   | 3 +++
 package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk   | 3 +++
 package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk       | 3 +++
 package/x11r7/xfont_encodings/xfont_encodings.mk                       | 3 +++
 package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk       | 3 +++
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk         | 3 +++
 .../xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk   | 3 +++
 .../xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk     | 3 +++
 .../xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk     | 3 +++
 package/x11r7/xfont_font-alias/xfont_font-alias.mk                     | 3 +++
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk         | 3 +++
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk             | 3 +++
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk               | 3 +++
 .../xfont_font-bh-lucidatypewriter-100dpi.mk                           | 3 +++
 .../xfont_font-bh-lucidatypewriter-75dpi.mk                            | 3 +++
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk                   | 3 +++
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk               | 3 +++
 .../x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk   | 3 +++
 package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 3 +++
 package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 3 +++
 package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 3 +++
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk         | 3 +++
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk         | 3 +++
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk               | 3 +++
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk             | 3 +++
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk             | 3 +++
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk               | 3 +++
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk           | 3 +++
 package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk     | 3 +++
 package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk     | 3 +++
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk         | 3 +++
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk             | 3 +++
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk             | 3 +++
 package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 3 +++
 package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 3 +++
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk             | 3 +++
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk               | 3 +++
 package/x11r7/xfont_font-util/xfont_font-util.mk                       | 3 +++
 .../x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 3 +++
 package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk     | 3 +++
 package/x11r7/xkeyboard-config/xkeyboard-config.mk                     | 3 +++
 package/x11r7/xlib_libFS/xlib_libFS.mk                                 | 3 +++
 package/x11r7/xlib_libICE/xlib_libICE.mk                               | 3 +++
 package/x11r7/xlib_libSM/xlib_libSM.mk                                 | 3 +++
 package/x11r7/xlib_libX11/xlib_libX11.mk                               | 3 +++
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk                 | 3 +++
 package/x11r7/xlib_libXau/xlib_libXau.mk                               | 3 +++
 package/x11r7/xlib_libXaw/xlib_libXaw.mk                               | 3 +++
 package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk                 | 3 +++
 package/x11r7/xlib_libXcursor/xlib_libXcursor.mk                       | 3 +++
 package/x11r7/xlib_libXdamage/xlib_libXdamage.mk                       | 3 +++
 package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk                           | 3 +++
 package/x11r7/xlib_libXext/xlib_libXext.mk                             | 3 +++
 package/x11r7/xlib_libXfixes/xlib_libXfixes.mk                         | 3 +++
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                           | 3 +++
 package/x11r7/xlib_libXft/xlib_libXft.mk                               | 3 +++
 package/x11r7/xlib_libXi/xlib_libXi.mk                                 | 3 +++
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk                     | 3 +++
 package/x11r7/xlib_libXmu/xlib_libXmu.mk                               | 3 +++
 package/x11r7/xlib_libXpm/xlib_libXpm.mk                               | 3 +++
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk                         | 3 +++
 package/x11r7/xlib_libXrender/xlib_libXrender.mk                       | 3 +++
 package/x11r7/xlib_libXres/xlib_libXres.mk                             | 3 +++
 package/x11r7/xlib_libXt/xlib_libXt.mk                                 | 3 +++
 package/x11r7/xlib_libXtst/xlib_libXtst.mk                             | 3 +++
 package/x11r7/xlib_libXv/xlib_libXv.mk                                 | 3 +++
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                             | 3 +++
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk                     | 3 +++
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk                       | 3 +++
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                               | 3 +++
 package/x11r7/xlib_libfontenc/xlib_libfontenc.mk                       | 3 +++
 package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk                       | 3 +++
 package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk                   | 3 +++
 package/x11r7/xlib_xtrans/xlib_xtrans.mk                               | 3 +++
 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk               | 3 +++
 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk               | 3 +++
 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk           | 3 +++
 package/x11r7/xproto_damageproto/xproto_damageproto.mk                 | 3 +++
 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk                       | 3 +++
 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk                     | 3 +++
 package/x11r7/xproto_dri3proto/xproto_dri3proto.mk                     | 3 +++
 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk                   | 3 +++
 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk           | 3 +++
 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk                   | 3 +++
 package/x11r7/xproto_glproto/xproto_glproto.mk                         | 3 +++
 package/x11r7/xproto_inputproto/xproto_inputproto.mk                   | 3 +++
 package/x11r7/xproto_kbproto/xproto_kbproto.mk                         | 3 +++
 package/x11r7/xproto_presentproto/xproto_presentproto.mk               | 3 +++
 package/x11r7/xproto_randrproto/xproto_randrproto.mk                   | 3 +++
 package/x11r7/xproto_recordproto/xproto_recordproto.mk                 | 3 +++
 package/x11r7/xproto_renderproto/xproto_renderproto.mk                 | 3 +++
 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk             | 3 +++
 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk           | 3 +++
 package/x11r7/xproto_videoproto/xproto_videoproto.mk                   | 3 +++
 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk           | 3 +++
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk                 | 3 +++
 package/x11r7/xproto_xextproto/xproto_xextproto.mk                     | 3 +++
 package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk       | 3 +++
 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk               | 3 +++
 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk               | 3 +++
 package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk       | 3 +++
 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk             | 3 +++
 package/x11r7/xproto_xproto/xproto_xproto.mk                           | 3 +++
 .../xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk | 3 +++
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk               | 3 +++
 package/x11r7/xutil_makedepend/xutil_makedepend.mk                     | 3 +++
 package/x11r7/xutil_util-macros/xutil_util-macros.mk                   | 3 +++
 243 files changed, 729 insertions(+)

package/x11r7/libepoxy/libepoxy.mk +3 -0

index 58b094a..8991b67 100644
@@ -17,4 +17,7 @@ LIBEPOXY_LICENSE_FILES = COPYING
 LIBEPOXY_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
 LIBEPOXY_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(LIBEPOXY_CFLAGS)"
 
+# Fixup incorrect paths
+LIBEPOXY_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/libxcb/libxcb.mk +3 -0

index c46ee26..8fbc6ea 100644
@@ -19,5 +19,8 @@ LIBXCB_DEPENDENCIES = \
 LIBXCB_CONF_OPTS = --with-doxygen=no
 HOST_LIBXCB_CONF_OPTS = --with-doxygen=no
 
+# Fixup incorrect paths
+LIBXCB_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xapp_appres/xapp_appres.mk +3 -0

index b84d742..c3ef032 100644
@@ -11,4 +11,7 @@ XAPP_APPRES_LICENSE = MIT
 XAPP_APPRES_LICENSE_FILES = COPYING
 XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
 
+# Fixup incorrect paths
+XAPP_APPRES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk +3 -0

index ebdcda5..c3e013c 100644
@@ -14,5 +14,8 @@ XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 # needed for linking against libXfont
 XAPP_BDFTOPCF_MAKE_OPTS += LIBS=-ldl
 
+# Fixup incorrect paths
+XAPP_BDFTOPCF_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xapp_beforelight/xapp_beforelight.mk +3 -0

index b39fe78..4a9966f 100644
@@ -11,4 +11,7 @@ XAPP_BEFORELIGHT_LICENSE = MIT
 XAPP_BEFORELIGHT_LICENSE_FILES = COPYING
 XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
 
+# Fixup incorrect paths
+XAPP_BEFORELIGHT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_bitmap/xapp_bitmap.mk +3 -0

index 851af31..684ca3e 100644
@@ -11,4 +11,7 @@ XAPP_BITMAP_LICENSE = MIT
 XAPP_BITMAP_LICENSE_FILES = COPYING
 XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
 
+# Fixup incorrect paths
+XAPP_BITMAP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_editres/xapp_editres.mk +3 -0

index 6cc4805..5a32665 100644
@@ -11,4 +11,7 @@ XAPP_EDITRES_LICENSE = MIT
 XAPP_EDITRES_LICENSE_FILES = COPYING
 XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
+# Fixup incorrect paths
+XAPP_EDITRES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk +3 -0

index 1571a3b..a54540c 100644
@@ -11,4 +11,7 @@ XAPP_FONTTOSFNT_LICENSE = MIT
 XAPP_FONTTOSFNT_LICENSE_FILES = COPYING
 XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
+# Fixup incorrect paths
+XAPP_FONTTOSFNT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk +3 -0

index 27786a5..cc93b2d 100644
@@ -11,4 +11,7 @@ XAPP_FSLSFONTS_LICENSE = MIT
 XAPP_FSLSFONTS_LICENSE_FILES = COPYING
 XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
 
+# Fixup incorrect paths
+XAPP_FSLSFONTS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_fstobdf/xapp_fstobdf.mk +3 -0

index e897514..d49b36f 100644
@@ -11,4 +11,7 @@ XAPP_FSTOBDF_LICENSE = MIT
 XAPP_FSTOBDF_LICENSE_FILES = COPYING
 XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
 
+# Fixup incorrect paths
+XAPP_FSTOBDF_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_iceauth/xapp_iceauth.mk +3 -0

index d30ff6f..1703738 100644
@@ -11,4 +11,7 @@ XAPP_ICEAUTH_LICENSE = MIT
 XAPP_ICEAUTH_LICENSE_FILES = COPYING
 XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
 
+# Fixup incorrect paths
+XAPP_ICEAUTH_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_ico/xapp_ico.mk +3 -0

index 621d1e4..db6be92 100644
@@ -11,4 +11,7 @@ XAPP_ICO_LICENSE = MIT
 XAPP_ICO_LICENSE_FILES = COPYING
 XAPP_ICO_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_ICO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_listres/xapp_listres.mk +3 -0

index 88cdd4f..707f4af 100644
@@ -11,4 +11,7 @@ XAPP_LISTRES_LICENSE = MIT
 XAPP_LISTRES_LICENSE_FILES = COPYING
 XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
+# Fixup incorrect paths
+XAPP_LISTRES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_luit/xapp_luit.mk +3 -0

index d3217fe..468be6f 100644
@@ -11,4 +11,7 @@ XAPP_LUIT_LICENSE = MIT
 XAPP_LUIT_LICENSE_FILES = COPYING
 XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
 
+# Fixup incorrect paths
+XAPP_LUIT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk +3 -0

index b74f993..e2b50ac 100644
@@ -11,5 +11,8 @@ XAPP_MKFONTDIR_LICENSE = MIT
 XAPP_MKFONTDIR_LICENSE_FILES = COPYING
 XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 
+# Fixup incorrect paths
+XAPP_MKFONTDIR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +3 -0

index b99a646..93ccca8 100644
@@ -11,5 +11,8 @@ XAPP_MKFONTSCALE_LICENSE = MIT
 XAPP_MKFONTSCALE_LICENSE_FILES = COPYING
 XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
 
+# Fixup incorrect paths
+XAPP_MKFONTSCALE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xapp_oclock/xapp_oclock.mk +3 -0

index 17d544c..8fe4a6a 100644
@@ -18,4 +18,7 @@ else
 XAPP_OCLOCK_CONF_OPTS += --without-xkb
 endif
 
+# Fixup incorrect paths
+XAPP_OCLOCK_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_rgb/xapp_rgb.mk +3 -0

index 82878ab..bc57196 100644
@@ -11,4 +11,7 @@ XAPP_RGB_LICENSE = MIT
 XAPP_RGB_LICENSE_FILES = COPYING
 XAPP_RGB_DEPENDENCIES = xproto_xproto
 
+# Fixup incorrect paths
+XAPP_RGB_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_rstart/xapp_rstart.mk +3 -0

index 2bcc292..dfaf59f 100644
@@ -11,4 +11,7 @@ XAPP_RSTART_LICENSE = MIT
 XAPP_RSTART_LICENSE_FILES = COPYING
 XAPP_RSTART_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_RSTART_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_scripts/xapp_scripts.mk +3 -0

index 5146db5..877cddd 100644
@@ -11,4 +11,7 @@ XAPP_SCRIPTS_LICENSE = MIT
 XAPP_SCRIPTS_LICENSE_FILES = COPYING
 XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_SCRIPTS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_sessreg/xapp_sessreg.mk +3 -0

index 08811c0..88ac06c 100644
@@ -11,4 +11,7 @@ XAPP_SESSREG_LICENSE = MIT
 XAPP_SESSREG_LICENSE_FILES = COPYING
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
 
+# Fixup incorrect paths
+XAPP_SESSREG_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk +3 -0

index b923d60..1ba4473 100644
@@ -11,4 +11,7 @@ XAPP_SETXKBMAP_LICENSE = MIT
 XAPP_SETXKBMAP_LICENSE_FILES = COPYING
 XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
+# Fixup incorrect paths
+XAPP_SETXKBMAP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_showfont/xapp_showfont.mk +3 -0

index c0b8c9a..a8122dc 100644
@@ -11,4 +11,7 @@ XAPP_SHOWFONT_LICENSE = MIT
 XAPP_SHOWFONT_LICENSE_FILES = COPYING
 XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
 
+# Fixup incorrect paths
+XAPP_SHOWFONT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_smproxy/xapp_smproxy.mk +3 -0

index f51c1ec..8af75c9 100644
@@ -11,4 +11,7 @@ XAPP_SMPROXY_LICENSE = MIT
 XAPP_SMPROXY_LICENSE_FILES = COPYING
 XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
 
+# Fixup incorrect paths
+XAPP_SMPROXY_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_twm/xapp_twm.mk +3 -0

index 1f576e1..17dcef0 100644
@@ -12,4 +12,7 @@ XAPP_TWM_LICENSE_FILES = COPYING
 XAPP_TWM_DEPENDENCIES = \
 	host-bison xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_TWM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_viewres/xapp_viewres.mk +3 -0

index 3e1fd8d..3d0a408 100644
@@ -11,4 +11,7 @@ XAPP_VIEWRES_LICENSE = MIT
 XAPP_VIEWRES_LICENSE_FILES = COPYING
 XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_VIEWRES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_x11perf/xapp_x11perf.mk +3 -0

index 8cba79d..5fc74ba 100644
@@ -11,4 +11,7 @@ XAPP_X11PERF_LICENSE = MIT
 XAPP_X11PERF_LICENSE_FILES = COPYING
 XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
 
+# Fixup incorrect paths
+XAPP_X11PERF_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xauth/xapp_xauth.mk +3 -0

index a2307f2..f9afce4 100644
@@ -11,4 +11,7 @@ XAPP_XAUTH_LICENSE = MIT
 XAPP_XAUTH_LICENSE_FILES = COPYING
 XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XAUTH_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xbacklight/xapp_xbacklight.mk +3 -0

index 88c4bc5..ef413c8 100644
@@ -11,4 +11,7 @@ XAPP_XBACKLIGHT_LICENSE = MIT
 XAPP_XBACKLIGHT_LICENSE_FILES = COPYING
 XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender xcb-util
 
+# Fixup incorrect paths
+XAPP_XBACKLIGHT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xbiff/xapp_xbiff.mk +3 -0

index 73e0350..d489c5f 100644
@@ -11,4 +11,7 @@ XAPP_XBIFF_LICENSE = MIT
 XAPP_XBIFF_LICENSE_FILES = COPYING
 XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
+# Fixup incorrect paths
+XAPP_XBIFF_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xcalc/xapp_xcalc.mk +3 -0

index 58fbdf5..d1ed42d 100644
@@ -12,4 +12,7 @@ XAPP_XCALC_LICENSE_FILES = COPYING
 XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XCALC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xclipboard/xapp_xclipboard.mk +3 -0

index 3620f75..0fefbcb 100644
@@ -11,4 +11,7 @@ XAPP_XCLIPBOARD_LICENSE = MIT
 XAPP_XCLIPBOARD_LICENSE_FILES = COPYING
 XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw xlib_libXmu xlib_libXt
 
+# Fixup incorrect paths
+XAPP_XCLIPBOARD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xclock/xapp_xclock.mk +3 -0

index 282d753..c231e42 100644
@@ -11,4 +11,7 @@ XAPP_XCLOCK_LICENSE = MIT
 XAPP_XCLOCK_LICENSE_FILES = COPYING
 XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
+# Fixup incorrect paths
+XAPP_XCLOCK_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk +3 -0

index 3cccacc..c8cc5c5 100644
@@ -11,4 +11,7 @@ XAPP_XCMSDB_LICENSE = MIT
 XAPP_XCMSDB_LICENSE_FILES = COPYING
 XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_XCMSDB_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk +3 -0

index 918c1e5..0b894f2 100644
@@ -16,4 +16,7 @@ XAPP_XCOMPMGR_DEPENDENCIES = \
 	xlib_libXfixes \
 	xlib_libXrender
 
+# Fixup incorrect paths
+XAPP_XCOMPMGR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xconsole/xapp_xconsole.mk +3 -0

index 971b1b3..8c9532e 100644
@@ -13,4 +13,7 @@ XAPP_XCONSOLE_DEPENDENCIES = \
 	xlib_libX11 xlib_libXaw xlib_libXt xproto_xproto \
 	xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XCONSOLE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk +3 -0

index f9ca39d..410e708 100644
@@ -11,5 +11,8 @@ XAPP_XCURSORGEN_LICENSE = MIT
 XAPP_XCURSORGEN_LICENSE_FILES = COPYING
 XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
+# Fixup incorrect paths
+XAPP_XCURSORGEN_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk +3 -0

index 72d04f8..e570454 100644
@@ -11,4 +11,7 @@ XAPP_XDBEDIZZY_LICENSE = MIT
 XAPP_XDBEDIZZY_LICENSE_FILES = COPYING
 XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext
 
+# Fixup incorrect paths
+XAPP_XDBEDIZZY_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xditview/xapp_xditview.mk +3 -0

index 4744c1f..253893e 100644
@@ -11,4 +11,7 @@ XAPP_XDITVIEW_LICENSE = MIT
 XAPP_XDITVIEW_LICENSE_FILES = COPYING
 XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XDITVIEW_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xdm/xapp_xdm.mk +3 -0

index 8f846a8..fb26446 100644
@@ -20,4 +20,7 @@ define XAPP_XDM_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S99xdm
 endef
 
+# Fixup incorrect paths
+XAPP_XDM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +3 -0

index cf94f70..c63a2a1 100644
@@ -34,4 +34,7 @@ else
 XAPP_XDPYINFO_CONF_OPTS += --without-xinerama
 endif
 
+# Fixup incorrect paths
+XAPP_XDPYINFO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +3 -0

index bb00d3b..834bb14 100644
@@ -11,4 +11,7 @@ XAPP_XDRIINFO_LICENSE = MIT
 XAPP_XDRIINFO_LICENSE_FILES = COPYING
 XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
 
+# Fixup incorrect paths
+XAPP_XDRIINFO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xedit/xapp_xedit.mk +3 -0

index 0f42e2c..815dfbd 100644
@@ -13,4 +13,7 @@ XAPP_XEDIT_DEPENDENCIES = xlib_libXaw
 
 XAPP_XEDIT_CONF_OPTS = --disable-selective-werror
 
+# Fixup incorrect paths
+XAPP_XEDIT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xev/xapp_xev.mk +3 -0

index 2a798db..8e6a541 100644
@@ -11,4 +11,7 @@ XAPP_XEV_LICENSE = MIT
 XAPP_XEV_LICENSE_FILES = COPYING
 XAPP_XEV_DEPENDENCIES = xlib_libX11 xlib_libXrandr
 
+# Fixup incorrect paths
+XAPP_XEV_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xeyes/xapp_xeyes.mk +3 -0

index 07c1200..4f36b5e 100644
@@ -11,4 +11,7 @@ XAPP_XEYES_LICENSE = MIT
 XAPP_XEYES_LICENSE_FILES = COPYING
 XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXrender xlib_libXt
 
+# Fixup incorrect paths
+XAPP_XEYES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xf86dga/xapp_xf86dga.mk +3 -0

index a2e08da..c66fb97 100644
@@ -17,4 +17,7 @@ XAPP_XF86DGA_DEPENDENCIES = \
 	xlib_libXaw \
 	xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XF86DGA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xfd/xapp_xfd.mk +3 -0

index e3c770b..4422dde 100644
@@ -11,4 +11,7 @@ XAPP_XFD_LICENSE = MIT
 XAPP_XFD_LICENSE_FILES = COPYING
 XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
 
+# Fixup incorrect paths
+XAPP_XFD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk +3 -0

index 7662a90..4423ede 100644
@@ -15,4 +15,7 @@ XAPP_XFINDPROXY_DEPENDENCIES = \
 	xproto_xproto \
 	xproto_xproxymanagementprotocol
 
+# Fixup incorrect paths
+XAPP_XFINDPROXY_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xfontsel/xapp_xfontsel.mk +3 -0

index 781b4d3..c62c96f 100644
@@ -11,4 +11,7 @@ XAPP_XFONTSEL_LICENSE = MIT
 XAPP_XFONTSEL_LICENSE_FILES = COPYING
 XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XFONTSEL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xfs/xapp_xfs.mk +3 -0

index 3e70455..4209338 100644
@@ -11,4 +11,7 @@ XAPP_XFS_LICENSE = MIT
 XAPP_XFS_LICENSE_FILES = COPYING
 XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
 
+# Fixup incorrect paths
+XAPP_XFS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +3 -0

index 38d01e4..fa11759 100644
@@ -11,4 +11,7 @@ XAPP_XFSINFO_LICENSE = MIT
 XAPP_XFSINFO_LICENSE_FILES = COPYING
 XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
 
+# Fixup incorrect paths
+XAPP_XFSINFO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xgamma/xapp_xgamma.mk +3 -0

index a73a29e..9c7049f 100644
@@ -11,4 +11,7 @@ XAPP_XGAMMA_LICENSE = MIT
 XAPP_XGAMMA_LICENSE_FILES = COPYING
 XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
 
+# Fixup incorrect paths
+XAPP_XGAMMA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xgc/xapp_xgc.mk +3 -0

index 41d42c4..ec9e75e 100644
@@ -11,4 +11,7 @@ XAPP_XGC_LICENSE = MIT
 XAPP_XGC_LICENSE_FILES = COPYING
 XAPP_XGC_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XGC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xhost/xapp_xhost.mk +3 -0

index a4bb16b..6328346 100644
@@ -11,4 +11,7 @@ XAPP_XHOST_LICENSE = MIT
 XAPP_XHOST_LICENSE_FILES = COPYING
 XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XHOST_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xinit/xapp_xinit.mk +3 -0

index a67ba14..dd31bd2 100644
@@ -11,4 +11,7 @@ XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
 XAPP_XINIT_LICENSE = MIT
 XAPP_XINIT_LICENSE_FILES = COPYING
 
+# Fixup incorrect paths
+XAPP_XINIT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk +3 -0

index 974b83d..928ab5f 100644
@@ -11,4 +11,7 @@ XAPP_XINPUT_CALIBRATOR_LICENSE = MIT
 XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING
 XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi
 
+# Fixup incorrect paths
+XAPP_XINPUT_CALIBRATOR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xinput/xapp_xinput.mk +3 -0

index 099408b..ff249bf 100644
@@ -11,4 +11,7 @@ XAPP_XINPUT_LICENSE = MIT
 XAPP_XINPUT_LICENSE_FILES = COPYING
 XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi xlib_libXrandr xlib_libXinerama
 
+# Fixup incorrect paths
+XAPP_XINPUT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +3 -0

index 0a72742..735c2d5 100644
@@ -12,5 +12,8 @@ XAPP_XKBCOMP_LICENSE_FILES = COPYING
 XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 XAPP_XKBCOMP_CONF_ENV = ac_cv_file___xkbparse_c=yes
 
+# Fixup incorrect paths
+XAPP_XKBCOMP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xapp_xkbevd/xapp_xkbevd.mk +3 -0

index 7a9a8fb..a86f580 100644
@@ -11,4 +11,7 @@ XAPP_XKBEVD_LICENSE = MIT
 XAPP_XKBEVD_LICENSE_FILES = COPYING
 XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
 
+# Fixup incorrect paths
+XAPP_XKBEVD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xkbprint/xapp_xkbprint.mk +3 -0

index 5f2300f..1157610 100644
@@ -11,4 +11,7 @@ XAPP_XKBPRINT_LICENSE = MIT
 XAPP_XKBPRINT_LICENSE_FILES = COPYING
 XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
 
+# Fixup incorrect paths
+XAPP_XKBPRINT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xkbutils/xapp_xkbutils.mk +3 -0

index 96ca8a4..ff8949b 100644
@@ -11,4 +11,7 @@ XAPP_XKBUTILS_LICENSE = MIT
 XAPP_XKBUTILS_LICENSE_FILES = COPYING
 XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
 
+# Fixup incorrect paths
+XAPP_XKBUTILS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xkill/xapp_xkill.mk +3 -0

index 76af1b9..ce599f5 100644
@@ -11,4 +11,7 @@ XAPP_XKILL_LICENSE = MIT
 XAPP_XKILL_LICENSE_FILES = COPYING
 XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XKILL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xload/xapp_xload.mk +3 -0

index 1db0db5..f693d3c 100644
@@ -11,4 +11,7 @@ XAPP_XLOAD_LICENSE = MIT
 XAPP_XLOAD_LICENSE_FILES = COPYING
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XLOAD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xlogo/xapp_xlogo.mk +3 -0

index 380acfc..1757ed0 100644
@@ -13,4 +13,7 @@ XAPP_XLOGO_DEPENDENCIES = \
 	xlib_libXaw xlib_libXrender \
 	xlib_libXft host-pkgconf
 
+# Fixup incorrect paths
+XAPP_XLOGO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +3 -0

index d6d9338..1b34fa9 100644
@@ -11,4 +11,7 @@ XAPP_XLSATOMS_LICENSE = MIT
 XAPP_XLSATOMS_LICENSE_FILES = COPYING
 XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XLSATOMS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xlsclients/xapp_xlsclients.mk +3 -0

index 798dce0..b247afc 100644
@@ -11,4 +11,7 @@ XAPP_XLSCLIENTS_LICENSE = MIT
 XAPP_XLSCLIENTS_LICENSE_FILES = COPYING
 XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util
 
+# Fixup incorrect paths
+XAPP_XLSCLIENTS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk +3 -0

index 1c42a61..bb974a7 100644
@@ -11,4 +11,7 @@ XAPP_XLSFONTS_LICENSE = MIT
 XAPP_XLSFONTS_LICENSE_FILES = COPYING
 XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_XLSFONTS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xmag/xapp_xmag.mk +3 -0

index bfc60c3..039f7f0 100644
@@ -11,4 +11,7 @@ XAPP_XMAG_LICENSE = MIT
 XAPP_XMAG_LICENSE_FILES = COPYING
 XAPP_XMAG_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XMAG_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xman/xapp_xman.mk +3 -0

index bca6bbf..fdb5329 100644
@@ -17,4 +17,7 @@ XAPP_XMAN_CONF_ENV = \
 	ac_cv_file__etc_manpath_config=no \
 	ac_cv_file__usr_share_misc_man_conf=no
 
+# Fixup incorrect paths
+XAPP_XMAN_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xmessage/xapp_xmessage.mk +3 -0

index 9c85563..05a764f 100644
@@ -11,4 +11,7 @@ XAPP_XMESSAGE_LICENSE = MIT
 XAPP_XMESSAGE_LICENSE_FILES = COPYING
 XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XMESSAGE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xmh/xapp_xmh.mk +3 -0

index c18bbfe..390ec81 100644
@@ -11,4 +11,7 @@ XAPP_XMH_LICENSE = MIT
 XAPP_XMH_LICENSE_FILES = COPYING
 XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
+# Fixup incorrect paths
+XAPP_XMH_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xmodmap/xapp_xmodmap.mk +3 -0

index 670bf9f..a96342d 100644
@@ -11,4 +11,7 @@ XAPP_XMODMAP_LICENSE = MIT
 XAPP_XMODMAP_LICENSE_FILES = COPYING
 XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_XMODMAP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xmore/xapp_xmore.mk +3 -0

index b0b0edf..a5074cc 100644
@@ -11,4 +11,7 @@ XAPP_XMORE_LICENSE = MIT
 XAPP_XMORE_LICENSE_FILES = COPYING
 XAPP_XMORE_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XMORE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xpr/xapp_xpr.mk +3 -0

index b2c4e04..a7e66b2 100644
@@ -11,4 +11,7 @@ XAPP_XPR_LICENSE = MIT
 XAPP_XPR_LICENSE_FILES = COPYING
 XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XPR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xprop/xapp_xprop.mk +3 -0

index 40a8577..5a8c86c 100644
@@ -11,4 +11,7 @@ XAPP_XPROP_LICENSE = MIT
 XAPP_XPROP_LICENSE_FILES = COPYING
 XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XPROP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xrandr/xapp_xrandr.mk +3 -0

index d2e4cf3..bfcc5ae 100644
@@ -12,4 +12,7 @@ XAPP_XRANDR_LICENSE_FILES = COPYING
 XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
 XAPP_XRANDR_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XAPP_XRANDR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xrdb/xapp_xrdb.mk +3 -0

index f32afa4..1acee9b 100644
@@ -11,4 +11,7 @@ XAPP_XRDB_LICENSE = MIT
 XAPP_XRDB_LICENSE_FILES = COPYING
 XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XRDB_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xrefresh/xapp_xrefresh.mk +3 -0

index 8403762..1dd7353 100644
@@ -11,4 +11,7 @@ XAPP_XREFRESH_LICENSE = MIT
 XAPP_XREFRESH_LICENSE_FILES = COPYING
 XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_XREFRESH_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xset/xapp_xset.mk +3 -0

index 157cd22..21f2c41 100644
@@ -11,4 +11,7 @@ XAPP_XSET_LICENSE = MIT
 XAPP_XSET_LICENSE_FILES = COPYING
 XAPP_XSET_DEPENDENCIES = xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XSET_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xsetmode/xapp_xsetmode.mk +3 -0

index c4599a9..e511760 100644
@@ -11,4 +11,7 @@ XAPP_XSETMODE_LICENSE = MIT
 XAPP_XSETMODE_LICENSE_FILES = COPYING
 XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
 
+# Fixup incorrect paths
+XAPP_XSETMODE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk +3 -0

index f56cdd5..607d35d 100644
@@ -11,4 +11,7 @@ XAPP_XSETPOINTER_LICENSE = MIT
 XAPP_XSETPOINTER_LICENSE_FILES = COPYING
 XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
 
+# Fixup incorrect paths
+XAPP_XSETPOINTER_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xsetroot/xapp_xsetroot.mk +3 -0

index 9000867..6caca45 100644
@@ -11,4 +11,7 @@ XAPP_XSETROOT_LICENSE = MIT
 XAPP_XSETROOT_LICENSE_FILES = COPYING
 XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps
 
+# Fixup incorrect paths
+XAPP_XSETROOT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xsm/xapp_xsm.mk +3 -0

index d4d2407..54ade50 100644
@@ -11,4 +11,7 @@ XAPP_XSM_LICENSE = MIT
 XAPP_XSM_LICENSE_FILES = COPYING
 XAPP_XSM_DEPENDENCIES = xlib_libXaw
 
+# Fixup incorrect paths
+XAPP_XSM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +3 -0

index a4d6dc3..37101a2 100644
@@ -11,4 +11,7 @@ XAPP_XSTDCMAP_LICENSE = MIT
 XAPP_XSTDCMAP_LICENSE_FILES = COPYING
 XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XSTDCMAP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +3 -0

index d7c4d5b..aa26164 100644
@@ -11,4 +11,7 @@ XAPP_XVIDTUNE_LICENSE = MIT
 XAPP_XVIDTUNE_LICENSE_FILES = COPYING
 XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
 
+# Fixup incorrect paths
+XAPP_XVIDTUNE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xvinfo/xapp_xvinfo.mk +3 -0

index 5b05a63..9a54dd8 100644
@@ -11,4 +11,7 @@ XAPP_XVINFO_LICENSE = MIT
 XAPP_XVINFO_LICENSE_FILES = COPYING
 XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
 
+# Fixup incorrect paths
+XAPP_XVINFO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xwd/xapp_xwd.mk +3 -0

index 0cda34e..e16fc17 100644
@@ -11,4 +11,7 @@ XAPP_XWD_LICENSE = MIT
 XAPP_XWD_LICENSE_FILES = COPYING
 XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libxkbfile
 
+# Fixup incorrect paths
+XAPP_XWD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +3 -0

index 8ae5961..2828738 100644
@@ -11,4 +11,7 @@ XAPP_XWININFO_LICENSE = MIT
 XAPP_XWININFO_LICENSE_FILES = COPYING
 XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
+# Fixup incorrect paths
+XAPP_XWININFO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xapp_xwud/xapp_xwud.mk +3 -0

index 60afd86..e23f7bd 100644
@@ -11,4 +11,7 @@ XAPP_XWUD_LICENSE = MIT
 XAPP_XWUD_LICENSE_FILES = COPYING
 XAPP_XWUD_DEPENDENCIES = xlib_libX11
 
+# Fixup incorrect paths
+XAPP_XWUD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcb-proto/xcb-proto.mk +3 -0

index 931573a..e26631a 100644
@@ -24,5 +24,8 @@ endef
 
 XCB_PROTO_POST_INSTALL_STAGING_HOOKS += XCB_PROTO_FIXUP_PC_FILE
 
+# Fixup incorrect paths
+XCB_PROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xcb-util-cursor/xcb-util-cursor.mk +3 -0

index 65704a1..4f66ae8 100644
@@ -12,4 +12,7 @@ XCB_UTIL_CURSOR_LICENSE_FILES = COPYING
 XCB_UTIL_CURSOR_INSTALL_STAGING = YES
 XCB_UTIL_CURSOR_DEPENDENCIES = xcb-util xcb-util-image xcb-util-renderutil
 
+# Fixup incorrect paths
+XCB_UTIL_CURSOR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcb-util-image/xcb-util-image.mk +3 -0

index 705b8a7..61c4b58 100644
@@ -11,4 +11,7 @@ XCB_UTIL_IMAGE_INSTALL_STAGING = YES
 XCB_UTIL_IMAGE_LICENSE = MIT
 XCB_UTIL_IMAGE_DEPENDENCIES = xcb-util
 
+# Fixup incorrect paths
+XCB_UTIL_IMAGE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk +3 -0

index 9036b06..9c9ccac 100644
@@ -15,4 +15,7 @@ XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES
 
 XCB_UTIL_KEYSYMS_DEPENDENCIES = host-pkgconf libxcb
 
+# Fixup incorrect paths
+XCB_UTIL_KEYSYMS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk +3 -0

index 9e6683b..cc2f03f 100644
@@ -12,4 +12,7 @@ XCB_UTIL_RENDERUTIL_LICENSE_FILES = COPYING
 XCB_UTIL_RENDERUTIL_INSTALL_STAGING = YES
 XCB_UTIL_RENDERUTIL_DEPENDENCIES = xcb-util
 
+# Fixup incorrect paths
+XCB_UTIL_RENDERUTIL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcb-util-wm/xcb-util-wm.mk +3 -0

index 95aeb22..9754cde 100644
@@ -11,4 +11,7 @@ XCB_UTIL_WM_INSTALL_STAGING = YES
 XCB_UTIL_WM_LICENSE = MIT
 XCB_UTIL_WM_DEPENDENCIES = libxcb
 
+# Fixup incorrect paths
+XCB_UTIL_WM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcb-util/xcb-util.mk +3 -0

index 4416d80..548e7e6 100644
@@ -14,4 +14,7 @@ XCB_UTIL_LICENSE = MIT
 XCB_UTIL_INSTALL_STAGING = YES
 XCB_UTIL_DEPENDENCIES = host-gperf libxcb
 
+# Fixup incorrect paths
+XCB_UTIL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk +3 -0

index 5c6f2d2..4eb1753 100644
@@ -17,4 +17,7 @@ endef
 
 XCURSOR_TRANSPARENT_THEME_POST_INSTALL_TARGET_HOOKS += ICONS_DEFAULT_CONFIG_INSTALL
 
+# Fixup incorrect paths
+XCURSOR_TRANSPARENT_THEME_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +3 -0

index 9767f2c..6a6ff58 100644
@@ -12,4 +12,7 @@ XDATA_XBITMAPS_LICENSE_FILES = COPYING
 
 XDATA_XBITMAPS_INSTALL_STAGING = YES
 
+# Fixup incorrect paths
+XDATA_XBITMAPS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +3 -0

index a2987a0..f32109f 100644
@@ -13,4 +13,7 @@ XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING
 XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
 XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
 
+# Fixup incorrect paths
+XDATA_XCURSOR_THEMES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk +3 -0

index 6019412..2438edc 100644
@@ -19,4 +19,7 @@ XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = \
 	udev \
 	$(if $(BR2_PACKAGE_MTDEV),mtdev)
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_EVDEV_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +3 -0

index c63312d..4b8d48a 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT
 XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_JOYSTICK_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +3 -0

index eb2d582..18e9083 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
 XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +3 -0

index 30973ea..a0572e9 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT
 XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xproto_inputproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_LIBINPUT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +3 -0

index 0e19467..2cd1e94 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT
 XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_MOUSE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +3 -0

index 28663d1..9a0bd65 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT
 XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_SYNAPTICS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +3 -0

index cd8c10a..12abca9 100644
@@ -16,4 +16,7 @@ XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \
 	xproto_xproto \
 	tslib
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_TSLIB_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +3 -0

index 6e9cf8b..8beed11 100644
@@ -18,4 +18,7 @@ else
 XDRIVER_XF86_INPUT_VMMOUSE_CONF_OPTS += --without-libudev
 endif
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_VMMOUSE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk +3 -0

index 5baa528..7038f62 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_INPUT_VOID_LICENSE = MIT
 XDRIVER_XF86_INPUT_VOID_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_INPUT_VOID_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +3 -0

index c0b905b..cdd1829 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT
 XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_ARK_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk +3 -0

index d040ccd..fa21191 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_AST_LICENSE = MIT
 XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xproto_fontsproto xproto_xproto xserver_xorg-server
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_AST_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +3 -0

index cba9e76..adc95a0 100644
@@ -28,4 +28,7 @@ else
 XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor
 endif
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk +3 -0

index 78e8a9c..d22dc1d 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_CIRRUS_LICENSE = MIT
 XDRIVER_XF86_VIDEO_CIRRUS_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_CIRRUS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +3 -0

index 58d9925..b844dc7 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT
 XDRIVER_XF86_VIDEO_DUMMY_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_DUMMY_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk +3 -0

index 7d08c7d..7163a89 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT
 XDRIVER_XF86_VIDEO_FBDEV_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_FBDEV_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk +3 -0

index 991b00e..089794d 100644
@@ -32,4 +32,7 @@ endef
 
 XDRIVER_XF86_VIDEO_FBTURBO_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +3 -0

index ae5bc0b..7a75a05 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT
 XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_GEODE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk +3 -0

index 3518789..6e308fa 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_GLIDE_LICENSE = MIT
 XDRIVER_XF86_VIDEO_GLIDE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_GLIDE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +3 -0

index 76c3da1..6aab645 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_GLINT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk +3 -0

index 1bb760c..9df956a 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_I128_LICENSE = MIT
 XDRIVER_XF86_VIDEO_I128_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_I128_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk +3 -0

index 5684a6d..5b9279f 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_IMX_DEPENDENCIES = linux libz160 xserver_xorg-server \
 	xproto_xf86dgaproto xproto_xproto
 XDRIVER_XF86_VIDEO_IMX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include"
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_IMX_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +3 -0

index f0b0753..fee917f 100644
@@ -50,4 +50,7 @@ else
 XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri
 endif
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +3 -0

index 9b438cb..00f40a8 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +3 -0

index dcf751c..dd9fcfe 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +3 -0

index cfd5536..7be982b 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT
 XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_NEOMAGIC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +3 -0

index 655bee9..1fa7ee8 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_NV_LICENSE = MIT
 XDRIVER_XF86_VIDEO_NV_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_NV_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +3 -0

index 345beb1..0b47446 100644
@@ -24,4 +24,7 @@ XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
 	xproto_xf86driproto \
 	xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_OPENCHROME_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +3 -0

index ddc4191..c8972dc 100644
@@ -29,4 +29,7 @@ else
 XDRIVER_XF86_VIDEO_QXL_CONF_OPTS += --disable-kms
 endif
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_QXL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +3 -0

index f9fcfdb..5d9d66e 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_R128_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +3 -0

index dc5644a..5a9f208 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk +3 -0

index 2aa22ae..5730147 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE = MIT
 XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_SILICONMOTION_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +3 -0

index b1fce83..5020c5c 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +3 -0

index 4d0ba60..d2c01c9 100644
@@ -12,4 +12,7 @@ XDRIVER_XF86_VIDEO_TDFX_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk +3 -0

index 8af5ac8..084b457 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT
 XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_TGA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +3 -0

index a136e87..57a7241 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT
 XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_TRIDENT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk +3 -0

index 607b605..e312a20 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_V4L_LICENSE = MIT
 XDRIVER_XF86_VIDEO_V4L_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_V4L_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +3 -0

index 1184821..006a040 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT
 XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_VESA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +3 -0

index ea4dd48..b45767a 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT
 XDRIVER_XF86_VIDEO_VMWARE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = mesa3d xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_VMWARE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +3 -0

index e1ef0c6..0d62474 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_VOODOO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk +3 -0

index c2d7d4d..773725f 100644
@@ -11,4 +11,7 @@ XDRIVER_XF86_VIDEO_WSFB_LICENSE = MIT
 XDRIVER_XF86_VIDEO_WSFB_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XDRIVER_XF86_VIDEO_WSFB_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_encodings/xfont_encodings.mk +3 -0

index 568dbcb..42b8c06 100644
@@ -12,5 +12,8 @@ XFONT_ENCODINGS_LICENSE_FILES = COPYING
 
 XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkgconf xutil_util-macros
 
+# Fixup incorrect paths
+XFONT_ENCODINGS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +3 -0

index 85a6884..724713d 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCAL
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ADOBE_100DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +3 -0

index bb0a184..5808ab5 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ADOBE_75DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +3 -0

index 390ca67..3906184 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKF
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ADOBE_UTOPIA_100DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +3 -0

index 7ecd46e..604a974 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFO
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ADOBE_UTOPIA_75DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +3 -0

index 6c780e2..383216b 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFO
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-alias/xfont_font-alias.mk +3 -0

index e2ac236..f1a57e2 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOS
 XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ALIAS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +3 -0

index fa1269b..862ac50 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ARABIC_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +3 -0

index fb16658..5da8797 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BH_100DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +3 -0

index c8ade59..dc09688 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BH_75DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +3 -0

index a1b61db..c1c0380 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_D
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +3 -0

index 00a6bd6..48ce8b3 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DI
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +3 -0

index f393dd3..98920f1 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HO
 XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BH_TTF_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +3 -0

index bf418d5..4cb9a0a 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BH_TYPE1_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +3 -0

index 5ddca73..267999d 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONT
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BITSTREAM_100DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +3 -0

index d7fea27..780559a 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BITSTREAM_75DPI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +3 -0

index 813e3cb..d66b7d2 100644
@@ -14,4 +14,7 @@ XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_BITSTREAM_TYPE1_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +3 -0

index 6dc9015..c1f3f61 100644
@@ -14,4 +14,7 @@ XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_CRONYX_CYRILLIC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +3 -0

index 59d6a84..bdf1f78 100644
@@ -14,4 +14,7 @@ XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_CURSOR_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +3 -0

index 59a84c7..92351e1 100644
@@ -13,4 +13,7 @@ XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_DAEWOO_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +3 -0

index b26296d..be5b14b 100644
@@ -14,4 +14,7 @@ XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_DEC_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +3 -0

index 6cec198..94fb5ba 100644
@@ -14,4 +14,7 @@ XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_IBM_TYPE1_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +3 -0

index 4ac4b9b..c48f466 100644
@@ -14,4 +14,7 @@ XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_ISAS_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +3 -0

index 5f8b001..b7e5175 100644
@@ -13,4 +13,7 @@ XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_JIS_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +3 -0

index 11b4199..2716813 100644
@@ -14,4 +14,7 @@ XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_MICRO_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +3 -0

index 16fd46b..e706d94 100644
@@ -14,4 +14,7 @@ XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCA
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_MISC_CYRILLIC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +3 -0

index 7d0825e..68a7d62 100644
@@ -14,4 +14,7 @@ XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCA
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_MISC_ETHIOPIC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +3 -0

index 5667869..de98d4d 100644
@@ -14,4 +14,7 @@ XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE
 XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_MISC_MELTHO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +3 -0

index 700837c..2d492b0 100644
@@ -14,4 +14,7 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_MISC_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +3 -0

index 53fc192..461c45c 100644
@@ -14,4 +14,7 @@ XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_MUTT_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +3 -0

index 0fa4d39..beca9b5 100644
@@ -14,4 +14,7 @@ XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_SCHUMACHER_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +3 -0

index 8158ce5..8b32257 100644
@@ -14,4 +14,7 @@ XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTS
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_SCREEN_CYRILLIC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +3 -0

index 035255f..ed3d788 100644
@@ -14,4 +14,7 @@ XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_SONY_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +3 -0

index 395cb87..e5b837a 100644
@@ -14,4 +14,7 @@ XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_SUN_MISC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-util/xfont_font-util.mk +3 -0

index 1c43d6a..8e0c1aa 100644
@@ -14,5 +14,8 @@ XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
 XFONT_FONT_UTIL_INSTALL_STAGING = YES
 XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XFONT_FONT_UTIL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +3 -0

index 665fb90..0786fd0 100644
@@ -14,4 +14,7 @@ XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFON
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_WINITZKI_CYRILLIC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +3 -0

index e1a2ef6..9bf649b 100644
@@ -14,4 +14,7 @@ XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCA
 XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+# Fixup incorrect paths
+XFONT_FONT_XFREE86_TYPE1_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xkeyboard-config/xkeyboard-config.mk +3 -0

index f88686b..5bbc11d 100644
@@ -13,4 +13,7 @@ XKEYBOARD_CONFIG_LICENSE_FILES = COPYING
 XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps
 XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
 
+# Fixup incorrect paths
+XKEYBOARD_CONFIG_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libFS/xlib_libFS.mk +3 -0

index a3c58b9..db2c2e2 100644
@@ -13,4 +13,7 @@ XLIB_LIBFS_INSTALL_STAGING = YES
 XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto host-pkgconf
 XLIB_LIBFS_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBFS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libICE/xlib_libICE.mk +3 -0

index e2a4e7d..d766a7e 100644
@@ -12,4 +12,7 @@ XLIB_LIBICE_LICENSE_FILES = COPYING
 XLIB_LIBICE_INSTALL_STAGING = YES
 XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto host-pkgconf
 
+# Fixup incorrect paths
+XLIB_LIBICE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libSM/xlib_libSM.mk +3 -0

index 30640bd..4551318 100644
@@ -13,4 +13,7 @@ XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPTS = --without-libuuid
 
+# Fixup incorrect paths
+XLIB_LIBSM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libX11/xlib_libX11.mk +3 -0

index fc19aa1..be65e1b 100644
@@ -45,5 +45,8 @@ endef
 XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 HOST_XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 
+# Fixup incorrect paths
+XLIB_LIBX11_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +3 -0

index f22ee98..3711c86 100644
@@ -13,4 +13,7 @@ XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
 XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
 XLIB_LIBXSCRNSAVER_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXSCRNSAVER_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXau/xlib_libXau.mk +3 -0

index 8ef48e4..1e9bbcc 100644
@@ -12,5 +12,8 @@ XLIB_LIBXAU_LICENSE_FILES = COPYING
 XLIB_LIBXAU_INSTALL_STAGING = YES
 XLIB_LIBXAU_DEPENDENCIES = host-pkgconf xutil_util-macros xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXAU_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXaw/xlib_libXaw.mk +3 -0

index d78adff..a182c5c 100644
@@ -12,4 +12,7 @@ XLIB_LIBXAW_LICENSE_FILES = COPYING
 XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXAW_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +3 -0

index f0e59cb..771b0a6 100644
@@ -12,4 +12,7 @@ XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
 XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXCOMPOSITE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +3 -0

index 508b5e2..d940ed1 100644
@@ -12,5 +12,8 @@ XLIB_LIBXCURSOR_LICENSE_FILES = COPYING
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
 XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXCURSOR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +3 -0

index 9f982ee..dc78ff5 100644
@@ -12,4 +12,7 @@ XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
 XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXDAMAGE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +3 -0

index 119c018..3552a18 100644
@@ -12,5 +12,8 @@ XLIB_LIBXDMCP_LICENSE_FILES = COPYING
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
 XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXDMCP_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXext/xlib_libXext.mk +3 -0

index 211c853..16b3aa4 100644
@@ -13,4 +13,7 @@ XLIB_LIBXEXT_INSTALL_STAGING = YES
 XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXEXT_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXEXT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +3 -0

index b94cd0f..2b2c3eb 100644
@@ -12,5 +12,8 @@ XLIB_LIBXFIXES_LICENSE_FILES = COPYING
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
 XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXFIXES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXfont/xlib_libXfont.mk +3 -0

index adc22b4..974a417 100644
@@ -26,5 +26,8 @@ ifeq ($(BR2_microblaze),y)
 XLIB_LIBXFONT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D__ELF__"
 endif
 
+# Fixup incorrect paths
+XLIB_LIBXFONT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXft/xlib_libXft.mk +3 -0

index de9b470..a7f0126 100644
@@ -13,4 +13,7 @@ XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXFT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXi/xlib_libXi.mk +3 -0

index 391247f..3a795a7 100644
@@ -20,4 +20,7 @@ XLIB_LIBXI_DEPENDENCIES = \
 
 XLIB_LIBXI_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXI_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +3 -0

index ee8bf55..d512c7b 100644
@@ -13,4 +13,7 @@ XLIB_LIBXINERAMA_INSTALL_STAGING = YES
 XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
 XLIB_LIBXINERAMA_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXINERAMA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXmu/xlib_libXmu.mk +3 -0

index 261f871..0930aeb 100644
@@ -12,4 +12,7 @@ XLIB_LIBXMU_LICENSE_FILES = COPYING
 XLIB_LIBXMU_INSTALL_STAGING = YES
 XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXMU_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXpm/xlib_libXpm.mk +3 -0

index 997ef95..5472a01 100644
@@ -17,4 +17,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	host-gettext
 
+# Fixup incorrect paths
+XLIB_LIBXPM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +3 -0

index 5abd8b1..5ca6763 100644
@@ -13,4 +13,7 @@ XLIB_LIBXRANDR_INSTALL_STAGING = YES
 XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
 XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXRANDR_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXrender/xlib_libXrender.mk +3 -0

index 949dea3..ae869ea 100644
@@ -13,5 +13,8 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
 XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXRENDER_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libXres/xlib_libXres.mk +3 -0

index 853f542..2e761cb 100644
@@ -13,4 +13,7 @@ XLIB_LIBXRES_INSTALL_STAGING = YES
 XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
 XLIB_LIBXRES_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXRES_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXt/xlib_libXt.mk +3 -0

index 4715ac6..35bc1ef 100644
@@ -14,4 +14,7 @@ XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xc
 XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull --disable-install-makestrs
 XLIB_LIBXT_AUTORECONF = YES
 
+# Fixup incorrect paths
+XLIB_LIBXT_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXtst/xlib_libXtst.mk +3 -0

index ad3caea..e66a771 100644
@@ -17,4 +17,7 @@ XLIB_LIBXTST_DEPENDENCIES = \
 	xlib_libXi \
 	xproto_recordproto
 
+# Fixup incorrect paths
+XLIB_LIBXTST_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXv/xlib_libXv.mk +3 -0

index ef5c746..4999d08 100644
@@ -13,4 +13,7 @@ XLIB_LIBXV_INSTALL_STAGING = YES
 XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
 XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXV_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +3 -0

index 101c15d..3c6adee 100644
@@ -13,4 +13,7 @@ XLIB_LIBXVMC_INSTALL_STAGING = YES
 XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
 XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXVMC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +3 -0

index eea756b..2774b6b 100644
@@ -13,4 +13,7 @@ XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
 XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
 XLIB_LIBXXF86DGA_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXXF86DGA_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +3 -0

index f650fe4..0a7de2a 100644
@@ -13,4 +13,7 @@ XLIB_LIBXXF86VM_INSTALL_STAGING = YES
 XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
 XLIB_LIBXXF86VM_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBXXF86VM_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libdmx/xlib_libdmx.mk +3 -0

index fbe3067..ae27129 100644
@@ -13,4 +13,7 @@ XLIB_LIBDMX_INSTALL_STAGING = YES
 XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
 XLIB_LIBDMX_CONF_OPTS = --disable-malloc0returnsnull
 
+# Fixup incorrect paths
+XLIB_LIBDMX_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +3 -0

index aff1f1a..f80273d 100644
@@ -12,5 +12,8 @@ XLIB_LIBFONTENC_LICENSE_FILES = COPYING
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBFONTENC_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +3 -0

index 51c58c0..50cc4eb 100644
@@ -12,5 +12,8 @@ XLIB_LIBXKBFILE_LICENSE_FILES = COPYING
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
 XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 
+# Fixup incorrect paths
+XLIB_LIBXKBFILE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +3 -0

index 3a2f326..2144103 100644
@@ -12,4 +12,7 @@ XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING
 XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES
 XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xproto_xproto
 
+# Fixup incorrect paths
+XLIB_LIBXSHMFENCE_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xlib_xtrans/xlib_xtrans.mk +3 -0

index 40f613c..667286d 100644
@@ -11,5 +11,8 @@ XLIB_XTRANS_LICENSE = MIT
 XLIB_XTRANS_LICENSE_FILES = COPYING
 XLIB_XTRANS_INSTALL_STAGING = YES
 
+# Fixup incorrect paths
+XLIB_XTRANS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_applewmproto/xproto_applewmproto.mk +3 -0

index 998d0aa..47c5bf2 100644
@@ -12,4 +12,7 @@ XPROTO_APPLEWMPROTO_LICENSE_FILES = COPYING
 XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
 XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_APPLEWMPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk +3 -0

index bca5a3c..98ec670 100644
@@ -12,4 +12,7 @@ XPROTO_BIGREQSPROTO_LICENSE_FILES = COPYING
 XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
 XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_BIGREQSPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_compositeproto/xproto_compositeproto.mk +3 -0

index 2161358..37f6c1c 100644
@@ -12,4 +12,7 @@ XPROTO_COMPOSITEPROTO_LICENSE_FILES = COPYING
 XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
 XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_COMPOSITEPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_damageproto/xproto_damageproto.mk +3 -0

index 0311ea4..4644865 100644
@@ -12,4 +12,7 @@ XPROTO_DAMAGEPROTO_LICENSE_FILES = COPYING
 XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
 XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_DAMAGEPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_dmxproto/xproto_dmxproto.mk +3 -0

index 4cc795c..97b3119 100644
@@ -12,4 +12,7 @@ XPROTO_DMXPROTO_LICENSE_FILES = COPYING
 XPROTO_DMXPROTO_INSTALL_STAGING = YES
 XPROTO_DMXPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_DMXPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_dri2proto/xproto_dri2proto.mk +3 -0

index e4ed7d8..435a572 100644
@@ -12,4 +12,7 @@ XPROTO_DRI2PROTO_LICENSE_FILES = COPYING
 XPROTO_DRI2PROTO_INSTALL_STAGING = YES
 XPROTO_DRI2PROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_DRI2PROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_dri3proto/xproto_dri3proto.mk +3 -0

index bdbff74..4c986a4 100644
@@ -12,4 +12,7 @@ XPROTO_DRI3PROTO_INSTALL_STAGING = YES
 # this package does not contain any binary files
 XPROTO_DRI3PROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_DRI3PROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_fixesproto/xproto_fixesproto.mk +3 -0

index 55212b2..36c86e0 100644
@@ -12,5 +12,8 @@ XPROTO_FIXESPROTO_LICENSE_FILES = COPYING
 XPROTO_FIXESPROTO_INSTALL_STAGING = YES
 XPROTO_FIXESPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_FIXESPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk +3 -0

index 0cb205a..c700930 100644
@@ -12,5 +12,8 @@ XPROTO_FONTCACHEPROTO_LICENSE_FILES = COPYING
 XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
 XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_FONTCACHEPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_fontsproto/xproto_fontsproto.mk +3 -0

index b4e6d6a..df32431 100644
@@ -12,5 +12,8 @@ XPROTO_FONTSPROTO_LICENSE_FILES = COPYING
 XPROTO_FONTSPROTO_INSTALL_STAGING = YES
 XPROTO_FONTSPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_FONTSPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_glproto/xproto_glproto.mk +3 -0

index ccfc6de..4820134 100644
@@ -12,4 +12,7 @@ XPROTO_GLPROTO_LICENSE_FILES = COPYING
 XPROTO_GLPROTO_INSTALL_STAGING = YES
 XPROTO_GLPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_GLPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_inputproto/xproto_inputproto.mk +3 -0

index a3a6065..54ae4ab 100644
@@ -12,5 +12,8 @@ XPROTO_INPUTPROTO_LICENSE_FILES = COPYING
 XPROTO_INPUTPROTO_INSTALL_STAGING = YES
 XPROTO_INPUTPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_INPUTPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_kbproto/xproto_kbproto.mk +3 -0

index b6c818f..8780c26 100644
@@ -12,5 +12,8 @@ XPROTO_KBPROTO_LICENSE_FILES = COPYING
 XPROTO_KBPROTO_INSTALL_STAGING = YES
 XPROTO_KBPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_KBPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_presentproto/xproto_presentproto.mk +3 -0

index 6fea0a2..37b3ee1 100644
@@ -13,4 +13,7 @@ XPROTO_PRESENTPROTO_DEPENDENCIES = host-pkgconf xutil_util-macros
 XPROTO_PRESENTPROTO_INSTALL_STAGING = YES
 XPROTO_PRESENTPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_PRESENTPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_randrproto/xproto_randrproto.mk +3 -0

index f6c4878..c9c1844 100644
@@ -12,4 +12,7 @@ XPROTO_RANDRPROTO_LICENSE_FILES = COPYING
 XPROTO_RANDRPROTO_INSTALL_STAGING = YES
 XPROTO_RANDRPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_RANDRPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_recordproto/xproto_recordproto.mk +3 -0

index 2d2ccea..8bbcff5 100644
@@ -12,4 +12,7 @@ XPROTO_RECORDPROTO_LICENSE_FILES = COPYING
 XPROTO_RECORDPROTO_INSTALL_STAGING = YES
 XPROTO_RECORDPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_RECORDPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_renderproto/xproto_renderproto.mk +3 -0

index 41a8445..de42df5 100644
@@ -12,5 +12,8 @@ XPROTO_RENDERPROTO_LICENSE_FILES = COPYING
 XPROTO_RENDERPROTO_INSTALL_STAGING = YES
 XPROTO_RENDERPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_RENDERPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_resourceproto/xproto_resourceproto.mk +3 -0

index 960ca13..02d8c60 100644
@@ -12,4 +12,7 @@ XPROTO_RESOURCEPROTO_LICENSE_FILES = COPYING
 XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
 XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_RESOURCEPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk +3 -0

index 57047cf..a967da5 100644
@@ -12,4 +12,7 @@ XPROTO_SCRNSAVERPROTO_LICENSE_FILES = COPYING
 XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
 XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_SCRNSAVERPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_videoproto/xproto_videoproto.mk +3 -0

index 9226c73..15f7301 100644
@@ -12,4 +12,7 @@ XPROTO_VIDEOPROTO_LICENSE_FILES = COPYING
 XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
 XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_VIDEOPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk +3 -0

index 067bccf..4d391b0 100644
@@ -12,4 +12,7 @@ XPROTO_WINDOWSWMPROTO_LICENSE_FILES = COPYING
 XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
 XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_WINDOWSWMPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk +3 -0

index 3bef2e9..12b53f7 100644
@@ -13,5 +13,8 @@ XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
 XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs
 HOST_XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs
 
+# Fixup incorrect paths
+XPROTO_XCMISCPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_xextproto/xproto_xextproto.mk +3 -0

index c17dd93..131f3ff 100644
@@ -13,5 +13,8 @@ XPROTO_XEXTPROTO_INSTALL_STAGING = YES
 XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs
 HOST_XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs
 
+# Fixup incorrect paths
+XPROTO_XEXTPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk +3 -0

index f88f5ec..3922be7 100644
@@ -12,5 +12,8 @@ XPROTO_XF86BIGFONTPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
 XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XF86BIGFONTPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk +3 -0

index d671bf0..162904b 100644
@@ -12,4 +12,7 @@ XPROTO_XF86DGAPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XF86DGAPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk +3 -0

index e6bb0f1..b0bdbdf 100644
@@ -12,4 +12,7 @@ XPROTO_XF86DRIPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
 XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XF86DRIPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk +3 -0

index 4163798..c52a103 100644
@@ -12,4 +12,7 @@ XPROTO_XF86VIDMODEPROTO_LICENSE_FILES = COPYING
 XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
 XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XF86VIDMODEPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk +3 -0

index 4c9ae11..d73c373 100644
@@ -12,4 +12,7 @@ XPROTO_XINERAMAPROTO_LICENSE_FILES = COPYING
 XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
 XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XINERAMAPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xproto_xproto/xproto_xproto.mk +3 -0

index 7357b8c..709c436 100644
@@ -12,5 +12,8 @@ XPROTO_XPROTO_LICENSE_FILES = COPYING
 XPROTO_XPROTO_INSTALL_STAGING = YES
 XPROTO_XPROTO_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XPROTO_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk +3 -0

index a48269a..2a8ed59 100644
@@ -12,4 +12,7 @@ XPROTO_XPROXYMANAGEMENTPROTOCOL_LICENSE_FILES = COPYING
 XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_STAGING = YES
 XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XPROTO_XPROXYMANAGEMENTPROTOCOL_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +3 -0

index 3f6cda7..a4266c7 100644
@@ -237,4 +237,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1
 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
 endif
 
+# Fixup incorrect paths
+XSERVER_XORG_SERVER_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))

package/x11r7/xutil_makedepend/xutil_makedepend.mk +3 -0

index 81e348e..555f4ff 100644
@@ -12,5 +12,8 @@ XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING
 
 XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
 
+# Fixup incorrect paths
+XUTIL_MAKEDEPEND_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/x11r7/xutil_util-macros/xutil_util-macros.mk +3 -0

index 1451a06..3244148 100644
@@ -13,5 +13,8 @@ XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING
 XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
 XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
 
+# Fixup incorrect paths
+XUTIL_UTIL_MACROS_CONF_OPTS += $(X11R7_CONF_OPTS)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

Signature · 1 line

1.9.1

Yann E. MORIN

author

2015-11-01 23:00 UTC #3 lore raw

RFC PATCH 3/4 core/pkg-generic: allow step hooks to fail a step

In reply to Yann E. MORIN

Currently, we touch our stamp files before we call the step hooks. This means a step hook can not properly fail a step, since the stamp file exists even if the hook exits in error, thus a subsequent 'make' would not try to redo that step.

Fix that by calling the hooks before we touch the stamp files.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc Romain Naour <[email protected]>

---
 package/pkg-generic.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

package/pkg-generic.mk +8 -8

index ffef4d3..3db616c 100644
@@ -125,8 +125,8 @@ $(BUILD_DIR)/%/.stamp_extracted:
 # some packages have messed up permissions inside
 	$(Q)chmod -R +rw $(@D)
 	$(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep))
-	$(Q)touch $@
 	@$(call step_end,extract)
+	$(Q)touch $@
 
 # Rsync the source directory if the <pkg>_OVERRIDE_SRCDIR feature is
 # used.

@@ -165,8 +165,8 @@ $(BUILD_DIR)/%/.stamp_patched:
 	done; \
 	)
 	$(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep))
-	$(Q)touch $@
 	@$(call step_end,patch)
+	$(Q)touch $@
 
 # Check that all directories specified in BR2_GLOBAL_PATCH_DIR exist.
 $(foreach dir,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)),\

@@ -180,8 +180,8 @@ $(BUILD_DIR)/%/.stamp_configured:
 	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
 	$($(PKG)_CONFIGURE_CMDS)
 	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-	$(Q)touch $@
 	@$(call step_end,configure)
+	$(Q)touch $@
 
 # Build
 $(BUILD_DIR)/%/.stamp_built::

@@ -190,8 +190,8 @@ $(BUILD_DIR)/%/.stamp_built::
 	$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
 	+$($(PKG)_BUILD_CMDS)
 	$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
-	$(Q)touch $@
 	@$(call step_end,build)
+	$(Q)touch $@
 
 # Install to host dir
 $(BUILD_DIR)/%/.stamp_host_installed:

@@ -200,8 +200,8 @@ $(BUILD_DIR)/%/.stamp_host_installed:
 	$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
 	+$($(PKG)_INSTALL_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
-	$(Q)touch $@
 	@$(call step_end,install-host)
+	$(Q)touch $@
 
 # Install to staging dir
 #

@@ -251,8 +251,8 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 				-e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \
 			-e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
 			-e "s:@BASE_DIR@:$(BASE_DIR):g"
-	$(Q)touch $@
 	@$(call step_end,install-staging)
+	$(Q)touch $@
 
 # Install to images dir
 $(BUILD_DIR)/%/.stamp_images_installed:

@@ -261,8 +261,8 @@ $(BUILD_DIR)/%/.stamp_images_installed:
 	@$(call MESSAGE,"Installing to images directory")
 	+$($(PKG)_INSTALL_IMAGES_CMDS)
 	$(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep))
-	$(Q)touch $@
 	@$(call step_end,install-image)
+	$(Q)touch $@
 
 # Install to target dir
 $(BUILD_DIR)/%/.stamp_target_installed:

@@ -278,8 +278,8 @@ $(BUILD_DIR)/%/.stamp_target_installed:
 	$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
 		$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
 	fi
-	$(Q)touch $@
 	@$(call step_end,install-target)
+	$(Q)touch $@
 
 # Remove package sources
 $(BUILD_DIR)/%/.stamp_dircleaned:

Signature · 1 line

1.9.1

Yann E. MORIN

author

2015-11-01 23:00 UTC #4 lore raw

RFC PATCH 4/4 core/pkg-generic: check proper package installation

In reply to Yann E. MORIN

Some packages misbehave, and install files in either $(STAGING_DIR)/$(O) or in $(TARGET_DIR)/$(O) .

One common reason for that is that pkgconf now prepends the sysroot path to all the paths it returns. Other reasons vary, but are mostly due to poorly writen generic-packages.

And a new step hooks to check that no file gets installed in either location, called after the install-target and install-staging steps.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc Romain Naour <[email protected]>

---
 package/pkg-generic.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

package/pkg-generic.mk +15 -0

index 3db616c..59b0938 100644
@@ -87,6 +87,21 @@ define step_pkg_size
 endef
 GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size
 
+define step_check_build_dir_one
+	if [ -d $(2) ]; then \
+		printf "%s: installs files in %s\n" $(1) $(2) >&2; \
+		exit 1; \
+	fi
+endef
+
+define step_check_build_dir
+	$(if $(filter install-staging,$(2)),\
+		$(if $(filter end,$(1)),$(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(O))))
+	$(if $(filter install-target,$(2)),\
+		$(if $(filter end,$(1)),$(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(O))))
+endef
+GLOBAL_INSTRUMENTATION_HOOKS += step_check_build_dir
+
 # User-supplied script
 ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),)
 define step_user

Signature · 1 line

1.9.1

Peter Seiderer

2015-11-01 23:36 UTC #5 lore raw

cover xorg: fix installation paths (branch yem/xorg)

In reply to Yann E. MORIN

Hello Yann,

Quoted 5 lines · Yann E. MORIN

Hello All!
This series is an attempt to fix the installation paths of many Xorg-related packages.

Quoted 7 lines

*This is an RFC.* There is an alternate proposal after the explanations on the series.
The new pkconf bumped in d7f6d320 introduced a change in behaviour: all path variables returned by pkgconf are now prefixed with the sysroot directory.

...this commit breaks some other packages too, see [1] for libv4l example.

This commit removed a patch named '0002-fix-double-sysroot.patch', I think this patch should somehow be forward ported to the new pkconf packet...

Regards,
Peter

[1] http://lists.busybox.net/pipermail/buildroot/2015-October/141429.html

Gustavo Zacarias

2015-11-02 10:38 UTC #6 lore raw

cover xorg: fix installation paths (branch yem/xorg)

Quoted 5 lines · Peter Seiderer

Quoted 4 lines
The new pkconf bumped in d7f6d320 introduced a change in behaviour: all path variables returned by pkgconf are now prefixed with the sysroot directory.

Quoted 7 lines

...this commit breaks some other packages too, see [1] for libv4l example.
This commit removed a patch named '0002-fix-double-sysroot.patch', I think this patch should somehow be forward ported to the new pkconf packet...
Regards,
Peter

Hi Peter.
That's wrong, double-sysroot is natively removed by the newer versions of pkgconf, if you have this:

./usr/lib/pkgconfig/libxslt.pc:Libs: -L${libdir} -lxslt -lxml2 -L/home/gustavoz/b/midx11/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib -lz -lm -ldl -lm

And do this:

$ ./pkg-config --libs libxslt
-L/home/gustavoz/b/midx11/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib 
-lxslt  -lz -ldl -lm -lxml2

The output is as expected.

The problem is two-fold as we discussed with Yann last night. On one side the pkg-config manpage says:

PKG_CONFIG_SYSROOT_DIR
Modify -I and -L to use the directories located in target sys? root. this option is useful when cross-compiling packages that use pkg-config to determine CFLAGS and LDFLAGS. -I and -L are modified to point to the new system root. this means that a -I/usr/include/libfoo will become -I/var/target/usr/include/lib? foo with a PKG_CONFIG_SYSROOT_DIR equal to /var/target (same rule apply to -L)

So pkgconf is being "too happy" in applying the sysroot prefix to all directories it finds in any variable.

On the other hand on the previous 0001-fix-variable.patch it did:

if ( !strcmp(req.variable, "includedir") ||
         !strcmp(req.variable, "mapdir") ||
         !strcmp(req.variable, "sdkdir") ||
         !strcmp(req.variable, "libdir"))
               printf("%s%s\n", sysroot_dir, req.buf);
       else
               printf("%s\n", req.buf);

So it was adding the sysroot prefix for mapdir & sdkdir as well, very much out of specification (we'll call the manpage a spec), catering for package abuse.

In the end our previous pkgconf was working out of spec, which may be ok, but poses the question, how many of these variables should be patched/prefixed as well? Because in the future other packages with their $nonstandard variable may need this as well, and patching and patching pkgconf for eternity doesn't sound so great.

First pkgconf should be patched to fix the out-of-spec functionality and send that upstream, but variable exceptions won't roll.

For the second problem i think mangling the .pc files would be best for the special variables, based on a per-package definition where you can say which other variables should be prefixed.

Regards.

Peter Seiderer

2015-11-02 17:19 UTC #7 lore raw

cover xorg: fix installation paths (branch yem/xorg)

Hello Gustavo,

Quoted 29 lines · Gustavo Zacarias

Quoted 5 lines · Peter Seiderer
Quoted 4 lines
The new pkconf bumped in d7f6d320 introduced a change in behaviour: all path variables returned by pkgconf are now prefixed with the sysroot directory.
Quoted 7 lines
...this commit breaks some other packages too, see [1] for libv4l example.
This commit removed a patch named '0002-fix-double-sysroot.patch', I think this patch should somehow be forward ported to the new pkconf packet...
Regards,
Peter
Hi Peter.
That's wrong, double-sysroot is natively removed by the newer versions of pkgconf, if you have this:
./usr/lib/pkgconfig/libxslt.pc:Libs: -L${libdir} -lxslt -lxml2
(quoted diff) +0 -2
-L/home/gustavoz/b/midx11/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib 
-lz -lm -ldl -lm
And do this:
$ ./pkg-config --libs libxslt
(quoted diff) +0 -2
-L/home/gustavoz/b/midx11/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib 
-lxslt  -lz -ldl -lm -lxml2

Quoted 2 lines

The output is as expected.

But not correct for Qt, eg. for 'moc' while building lib4l, see eg. [1]:

Build statistics for 2015-11-01
===============================
[...]

    mips64el |                   libv4l-1.8.1 | NOK | http://autobuild.buildroot.net/results/4ecf6d074a608a58d56e3567727028c0ca8dbe2b/
     powerpc |                   libv4l-1.8.1 | NOK | http://autobuild.buildroot.net/results/d5198d50c2df194138aaf72a1b90bd8d2e272ea1/

[...]

Both fail with a wrong path for moc (not double sysroot but one time sysroot is one to much):

/bin/bash: /home/buildroot/buildroot-test/scripts/instance-1/output/host/usr/mips64el-buildroot-linux-gnu/sysroot/home/buildroot/buildroot-test/scripts/instance-1/output/host/usr/bin/moc: No such file or directory

/bin/sh: /home/buildroot/build/instance-0/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/home/buildroot/build/instance-0/output/host/usr/bin/moc: No such file or directory Makefile:1154: recipe for target 'moc_qv4l2.cpp' failed

Or for my test build:

	$ ./host/usr/bin/pkg-config --variable=moc_location QtCore
/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/x86_64-buildroot-linux-gnu/sysroot/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/moc

	$ cat cat ./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/QtCore.pc
prefix=/usr
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include/QtCore
qt_config=lex yacc warn_on uic resources qt warn_on release incremental link_prl cross_compile shared def_files_disabled no_mocdepend release qt_no_framework silent cross_compile release embedded largefile mmx 3dnow sse sse2 sse3 ssse3 sse4_1 sse4_2 avx exceptions_off dylib create_prl link_prl depend_includepath QTDIR_build qt_install_headers qt warn_on depend_includepath qmake_cache target_qt hide_symbols create_pc create_libtool explicitlib moc thread dll shared
moc_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/moc
uic_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/uic
rcc_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/rcc
lupdate_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/lupdate
lrelease_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/lrelease

Name: Qtcore
Description: Qtcore Library
Version: 4.8.7
Libs: -L${libdir} -lQtCore
Libs.private: -L/usr/lib -lpthread -lm -ldl -lrt
Cflags: -DQT_SHARED -I/usr/include -I${includedir}

Quoted 35 lines

The problem is two-fold as we discussed with Yann last night. On one side the pkg-config manpage says:
PKG_CONFIG_SYSROOT_DIR
Modify -I and -L to use the directories located in target sys? root. this option is useful when cross-compiling packages that use pkg-config to determine CFLAGS and LDFLAGS. -I and -L are modified to point to the new system root. this means that a -I/usr/include/libfoo will become -I/var/target/usr/include/lib? foo with a PKG_CONFIG_SYSROOT_DIR equal to /var/target (same rule apply to -L)
So pkgconf is being "too happy" in applying the sysroot prefix to all directories it finds in any variable.
On the other hand on the previous 0001-fix-variable.patch it did:
if ( !strcmp(req.variable, "includedir") ||
         !strcmp(req.variable, "mapdir") ||
         !strcmp(req.variable, "sdkdir") ||
         !strcmp(req.variable, "libdir"))
               printf("%s%s\n", sysroot_dir, req.buf);
       else
               printf("%s\n", req.buf);
So it was adding the sysroot prefix for mapdir & sdkdir as well, very much out of specification (we'll call the manpage a spec), catering for package abuse.
In the end our previous pkgconf was working out of spec, which may be ok, but poses the question, how many of these variables should be patched/prefixed as well? Because in the future other packages with their $nonstandard variable may need this as well, and patching and patching pkgconf for eternity doesn't sound so great.

Quoted 6 lines

First pkgconf should be patched to fix the out-of-spec functionality and send that upstream, but variable exceptions won't roll.
For the second problem i think mangling the .pc files would be best for the special variables, based on a per-package definition where you can say which other variables should be prefixed.

Any suggestion how to fix the lib4vl case?

Regards,
Peter

Quoted 2 lines

Regards.

Yann E. MORIN

author

2015-11-02 17:33 UTC #8 lore raw

cover xorg: fix installation paths (branch yem/xorg)

Peter?, Gustavo, Thomas, All,

Peter K. and Thomas: we urgently need input from you on the topic...

On 2015-11-02 18:19 +0100, Peter Seiderer spake thusly:

Quoted 39 lines · Gustavo Zacarias

Quoted 28 lines · Peter Seiderer
Quoted 5 lines
Quoted 4 lines
The new pkconf bumped in d7f6d320 introduced a change in behaviour: all path variables returned by pkgconf are now prefixed with the sysroot directory.
Quoted 7 lines
...this commit breaks some other packages too, see [1] for libv4l example.
This commit removed a patch named '0002-fix-double-sysroot.patch', I think this patch should somehow be forward ported to the new pkconf packet...
Regards,
Peter
Hi Peter.
That's wrong, double-sysroot is natively removed by the newer versions of pkgconf, if you have this:
./usr/lib/pkgconfig/libxslt.pc:Libs: -L${libdir} -lxslt -lxml2
(quoted diff) +0 -2
-L/home/gustavoz/b/midx11/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib 
-lz -lm -ldl -lm
And do this:
$ ./pkg-config --libs libxslt
(quoted diff) +0 -2
-L/home/gustavoz/b/midx11/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib 
-lxslt  -lz -ldl -lm -lxml2
Quoted 2 lines
The output is as expected.
But not correct for Qt, eg. for 'moc' while building lib4l, see eg. [1]:
Build statistics for 2015-11-01
===============================
[...]
    mips64el |                   libv4l-1.8.1 | NOK | http://autobuild.buildroot.net/results/4ecf6d074a608a58d56e3567727028c0ca8dbe2b/
     powerpc |                   libv4l-1.8.1 | NOK | http://autobuild.buildroot.net/results/d5198d50c2df194138aaf72a1b90bd8d2e272ea1/

Quoted 7 lines

[...]
Both fail with a wrong path for moc (not double sysroot but one time sysroot is one to much):
/bin/bash: /home/buildroot/buildroot-test/scripts/instance-1/output/host/usr/mips64el-buildroot-linux-gnu/sysroot/home/buildroot/buildroot-test/scripts/instance-1/output/host/usr/bin/moc: No such file or directory /bin/sh: /home/buildroot/build/instance-0/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/home/buildroot/build/instance-0/output/host/usr/bin/moc: No such file or directory Makefile:1154: recipe for target 'moc_qv4l2.cpp' failed

Indeed, the build is utterly broken *today* for the whole Xorg stack, as well as any package using Qt.

We must find a solution ASAP, since we'r enearing -rc1 (already two days late., BTW).

The simplest solution in my opinion is to:
- revert d7f6d320
- add a post-staging-install action to remove comments from .pc files (to at least fix the nettle problem.

Yet, we'd still have the sdkdir and mapdir issue for the Xorg and fontutil stuff, but my series addresses the issue.

Peter K., Thoms, we need your input on this.

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Gustavo Zacarias

2015-11-02 18:04 UTC #9 lore raw

cover xorg: fix installation paths (branch yem/xorg)

In reply to Peter Seiderer

Quoted 1 line · Peter Seiderer

Hello Gustavo,

Hi Peter.

Quoted 26 lines

Both fail with a wrong path for moc (not double sysroot but one time sysroot is one to much):
/bin/bash: /home/buildroot/buildroot-test/scripts/instance-1/output/host/usr/mips64el-buildroot-linux-gnu/sysroot/home/buildroot/buildroot-test/scripts/instance-1/output/host/usr/bin/moc: No such file or directory
/bin/sh: /home/buildroot/build/instance-0/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/home/buildroot/build/instance-0/output/host/usr/bin/moc: No such file or directory Makefile:1154: recipe for target 'moc_qv4l2.cpp' failed
Or for my test build:
	$ ./host/usr/bin/pkg-config --variable=moc_location QtCore
/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/x86_64-buildroot-linux-gnu/sysroot/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/moc
	$ cat cat ./host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/QtCore.pc
prefix=/usr
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include/QtCore
qt_config=lex yacc warn_on uic resources qt warn_on release incremental link_prl cross_compile shared def_files_disabled no_mocdepend release qt_no_framework silent cross_compile release embedded largefile mmx 3dnow sse sse2 sse3 ssse3 sse4_1 sse4_2 avx exceptions_off dylib create_prl link_prl depend_includepath QTDIR_build qt_install_headers qt warn_on depend_includepath qmake_cache target_qt hide_symbols create_pc create_libtool explicitlib moc thread dll shared
moc_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/moc
uic_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/uic
rcc_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/rcc
lupdate_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/lupdate
lrelease_location=/home/seiderer/Work/build_i686_qt_v4l_utils/host/usr/bin/lrelease

Quoted 21 lines

Name: Qtcore
Description: Qtcore Library
Version: 4.8.7
Libs: -L${libdir} -lQtCore
Libs.private: -L/usr/lib -lpthread -lm -ldl -lrt
Cflags: -DQT_SHARED -I/usr/include -I${includedir}
Quoted 14 lines
The problem is two-fold as we discussed with Yann last night. On one side the pkg-config manpage says:
PKG_CONFIG_SYSROOT_DIR
Modify -I and -L to use the directories located in target sys? root. this option is useful when cross-compiling packages that use pkg-config to determine CFLAGS and LDFLAGS. -I and -L are modified to point to the new system root. this means that a -I/usr/include/libfoo will become -I/var/target/usr/include/lib? foo with a PKG_CONFIG_SYSROOT_DIR equal to /var/target (same rule apply to -L)
So pkgconf is being "too happy" in applying the sysroot prefix to all directories it finds in any variable.

Point 1 is what's happening, the *_location variables contain a HOST_DIR prepended to them, hence it's not a sysroot (STAGING_DIR), so it doesn't detect it as a duplicate because it's different, PKG_CONFIG_SYSROOT_DIR is setting the sysroot (in the pkgconfig wrapper script), hence pkgconf is prepending the sysroot to those.
This is a violation of the "only sysroot the -I/-L entries alone" spec. However xorg depends on mapdir/sdkdir being prepended as well, which is a grey rule - though that's a different problem.
First things first would be to make pkgconf pkgconfig conformant. Regards.