Re: pkg/37128 (imake packages fails to build on Linux, X11_TYPE=modular)

[Aleksey Cheusov <cheusov%tut.by@localhost>]

The following reply was made to PR pkg/37128; it has been noted by GNATS.

From: Aleksey Cheusov <cheusov%tut.by@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: joerg%NetBSD.org@localhost, pkg-manager%netbsd.org@localhost, 
pkgsrc-bugs%netbsd.org@localhost,
        gnats-admin%netbsd.org@localhost, obache%netbsd.org@localhost
Subject: Re: pkg/37128 (imake packages fails to build on Linux, 
X11_TYPE=modular)
Date: Sat, 17 Nov 2007 11:38:54 +0200

 --=-=-=
 
 > Synopsis: imake packages fails to build on Linux, X11_TYPE=modular
 
 > Responsible-Changed-From-To: pkg-manager->joerg
 > Responsible-Changed-By: obache%netbsd.org@localhost
 
 I'm not expert in imake but the following patch fixes the problem.
 It also fixes pkg/37294.
 
 
 --=-=-=
 Content-Type: text/x-patch
 Content-Disposition: inline; filename=pkgsrc_xorg_cf_files.patch
 Content-Description: patch
 
 Index: x11/xorg-cf-files/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xorg-cf-files/distinfo,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 distinfo
 --- x11/xorg-cf-files/distinfo 19 Dec 2006 22:54:51 -0000      1.1.1.1
 +++ x11/xorg-cf-files/distinfo 17 Nov 2007 09:10:44 -0000
 @@ -12,3 +12,4 @@
  SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
  SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
  SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
 +SHA1 (patch-aj) = 189806790dbe92f7e9d4b3e03b704b36f2c5b17b
 Index: x11/xorg-cf-files/files/host.def
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xorg-cf-files/files/host.def,v
 retrieving revision 1.2
 diff -u -r1.2 host.def
 --- x11/xorg-cf-files/files/host.def   17 Jun 2007 19:33:54 -0000      1.2
 +++ x11/xorg-cf-files/files/host.def   17 Nov 2007 09:10:44 -0000
 @@ -3,4 +3,3 @@
  #define ProjectRoot @PREFIX@
  #define ManPath @PREFIX@/@PKGMANDIR@
  #define BuildHtmlManPages NO
 -#define MakeCmd @MAKE@
 Index: x11/xorg-cf-files/patches/patch-aj
 ===================================================================
 RCS file: x11/xorg-cf-files/patches/patch-aj
 diff -N x11/xorg-cf-files/patches/patch-aj
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +++ x11/xorg-cf-files/patches/patch-aj 17 Nov 2007 09:10:44 -0000
 @@ -0,0 +1,49 @@
 +$NetBSD$
 +
 +--- lnxLib.rules.orig 2004-04-23 21:41:58.000000000 +0300
 ++++ lnxLib.rules
 +@@ -91,6 +91,8 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
 + #   ifdef UseInstalled
 + #    if LinuxBinUtilsMajorVersion < 27
 + #     define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
 ++#    else
 ++#     define ExtraLoadFlags RpathLoadFlags -Wl,-R$(USRLIBDIRPATH)
 + #    endif
 + #   else
 + #    define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
 +@@ -162,7 +164,7 @@ AllTarget(Concat(lib,libname.so.rev))                     
 + Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)                      
@@\
 +      $(RM) $@~                                                       @@\
 +      @SONAME=`echo $@ | sed 
's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \        @@\
 +-             cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME 
solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\
 ++             cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME 
solist $(REQUIREDLIBS) $(EXTRA_LOAD_FLAGS) BaseShLibReqs) || exit 1; \ @@\
 +              (set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \          @@\
 +              LinkBuildSonameLibrary($$SONAME)                        @@\
 +      $(RM) $@                                                        @@\
 +@@ -191,7 +193,7 @@ Concat(lib,libname.so):  solist $(EXTRAL
 +              SONAME=$@.$$MAJ; \                                      @@\
 +              (set -x; \                                              @@\
 +              $(RM) $@.$$MAJ.$$MIN~; \                                @@\
 +-             cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) 
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\
 ++             cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) 
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) $(EXTRA_LOAD_FLAGS) BaseShLibReqs) 
|| exit 1; \ @@\
 +              (set -x; \                                              @@\
 +              $(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \       @@\
 +              LinkBuildSonameLibrary($$SONAME); \                     @@\
 +@@ -222,7 +224,7 @@ AllTarget(Concat(lib,libname.so.rev))                     
 + Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)             @@\
 +      $(RM) $@~                                                       @@\
 +      @SONAME=`echo $@ | sed 
's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \         @@\
 +-             (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME 
solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
 ++             (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME 
solist $(REQUIREDLIBS) $(EXTRA_LOAD_FLAGS) BaseShLibReqs); \ @@\
 +              $(RM) $$SONAME; $(LN) $@ $$SONAME; \                    @@\
 +              LinkBuildSonameLibrary($$SONAME)                        @@\
 +      $(RM) $@                                                        @@\
 +@@ -250,7 +252,7 @@ AllTarget(Concat(lib,libname.so.rev))                     
 + Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)             @@\
 +      $(RM) $@~                                                       @@\
 +      @SONAME=`echo $@ | sed 
's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \         @@\
 +-             (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME 
solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
 ++             (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME 
solist $(REQUIREDLIBS) $(EXTRA_LOAD_FLAGS) BaseShLibReqs); \ @@\
 +              $(RM) $$SONAME; $(LN) $@ $$SONAME; \                    @@\
 +              LinkBuildSonameLibrary($$SONAME)                        @@\
 +      $(RM) $@                                                        @@\
 
 --=-=-=
 
 
 -- 
 Best regards, Aleksey Cheusov.
 
 --=-=-=--