Unix

NAVIGATION
CATEGORIES
REFERRENCE
LINKS
  • patch to close task #1017

    8 answers - 1617 bytes - related search similar search Add To My Delicious Add To My Stumble Upon Add To My Google Mark Add To My Facebook Add To My Digg Add To My Reddit

    Here is a patch for the $(HURD_SRC)/hurd/Makefile to install all the msgid files to $(prefix)/share/msgids.
    Can we get this commited so this task can be closed? I posted a few days ago asking for an agreement on where to store the files, Alfred was the only one who agreed(or even commented). Is this ok?
    #ifdefe BRAINSTRMING
    What does everyone think of changing `make hurd.msgids` to `make msgids`? Since the former builds more then just hurd.msgids.
    #endif /* BRAINSTRMING */
    hde@clubber:~/devel/hurd$ patch -p0 <install_msgids.patch
    patching file hurd/Makefile
    hde@clubber:~/devel/hurd-obj/hurd$ make hurd.msgids
    hde@clubber:~/devel/hurd-obj/hurd$ make install-msgids
    mkdir /home/hde/devel/share
    mkdir /home/hde/devel/share/msgids
    /usr/bin/install -c -m 644 *.msgids /home/hde/devel/share/msgids
    hde@clubber:~/devel/hurd$ diff -ru /hde_home/hurd/hurd/Makefile hurd/Makefile install_msgids.patch
    hde@clubber:~/devel/hurd$ cat install_msgids.patch
    /hde_home/hurd/hurd/Makefile 2005-07-25 06:09:42.000000000 -0400
    hurd/Makefile 2005-08-05 07:35:43.000000000 -0400
    @@ -38,6 +38,11 @@
    else $@; fi
    hurd.msgids: $(patsubst %.defs,%.msgids,$(filter %.defs,$(INSTHDRS)))
    cat $^ $@
    +
    +MSGIDIR = $(prefix)/share/msgids
    +install-msgids:
    + @$(MKINSTALLDIRS) $(MSGIDIR)
    + $(INSTALL_DATA) *.msgids $(MSGIDIR)
    #
    # The following rules assist in creating an `Xioctl.defs' file
    hde@clubber:~/devel/hurd$
    Happy Hacking
    Harley
    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.1 | | 1577 bytes | |

    Roland, K to commit?

    hurd/ChangeLog
    2005-08-05 Alfred M. Szmidt <ams (AT) gnu (DOT) org>

    * Makefile (MSGIDS): New variable.
    (all): New target.
    (install-headers, install): Depend on `install-msgids'.
    (install-msgids): New target
    ($(datadir)/msgids): New target.

    hurd/Makefile22 Aug 2002 23:25:04 +02001.28
    hurd/Makefile05 Aug 2005 20:44:20 +0200
    @@ -1,4 +1,4 @@
    -# Copyright (C) 1993,94,95,96,99,2002 Free Software Foundation
    +# Copyright (C) 1993,94,95,96,99,2002,2005 Free Software Foundation
    #
    # This program is free software; you can redistribute it and/or
    # modify it under the terms of the GNU General Public License as
    @@ -22,15 +22,20 @@ DIST_FILES = subsystems $(notdir $(hdrs)

    INSTHDRS = hurd_types.h version.h ioctl_types.h paths.h shared.h console.h \
    $(notdir $(wildcard $(srcdir)/*.defs))
    +MSGIDS := hurd.msgids $(patsubst %.defs,%.msgids,$(filter %.defs,$(INSTHDRS)))

    include /Makeconf

    +all: $(MSGIDS)
    +
    install-headers install: $(includedir)/hurd \
    -$(addprefix $(includedir)/hurd/,$(INSTHDRS))
    +$(addprefix $(includedir)/hurd/,$(INSTHDRS)) install-msgids
    +
    +install-msgids: $(MSGIDS); $(INSTALL_DATA) $^ $(datadir)/msgids

    $(includedir)/hurd/%: $(srcdir)/%; $(INSTALL_DATA) $< $@
    -$(includedir)/hurd:;mkdir -p $@
    +$(datadir)/msgids $(includedir)/hurd:;mkdir -p $@

    %.msgids: $(srcdir)/%.defs
    if grep -q '^subsystem' $<; \

    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.2 | | 327 bytes | |

    Could you wrap your lines after about 75 chars?

    What does everyone think of changing `make hurd.msgids` to `make
    msgids`? Since the former builds more then just hurd.msgids.

    `make ext2fs' builds far more than just `ext2fs'.

    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.3 | | 2276 bytes | |

    Fri, Aug 05, 2005 at 08:47:25PM +0200, Alfred M. Szmidt wrote:
    hurd/ChangeLog
    2005-08-05 Alfred M. Szmidt <ams (AT) gnu (DOT) org>

    * Makefile (MSGIDS): New variable.
    (all): New target.
    (install-headers, install): Depend on `install-msgids'.
    (install-msgids): New target
    ($(datadir)/msgids): New target.

    hurd/Makefile22 Aug 2002 23:25:04 +02001.28
    hurd/Makefile05 Aug 2005 20:44:20 +0200
    []
    install-headers install: $(includedir)/hurd \
    -$(addprefix $(includedir)/hurd/,$(INSTHDRS))
    +$(addprefix $(includedir)/hurd/,$(INSTHDRS)) install-msgids

    I'd suggest to leave out that change and instead use something like
    #v+
    install: install-msgids
    #v-
    Installing the msgids alongside the headers yields no real benefit, but
    makes cross compilations harder:

    #v+
    []
    /command/install -c -m 644 / /
    /command/install -c -m 644 / /
    if grep -q '^subsystem' /; \
    then gcc -E -x c -I. -I/var/tmp/gnu-4/src/hurd/hurd -I -I/var/tmp/gnu-4/src/hurd -I/include -D_GNU_SURCE -D_IMTSAFE_I -D_FILEFFSET_BITS=64 -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSIN=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPRT=\"\" -DHAVE_MIG_RETCDE=1 -DHAVE_GETGRUPLIST=1 -DHAVE_USELCALE=1 / | i586-pc-gnu-mig -cc cat - /dev/null -n -list auth.msgids; \
    else auth.msgids; fi
    In file included from /
    / mach/std_types.defs: No such file or directory
    / mach/mach_types.defs: No such file or directory
    / device/device_types.defs: No such file or directory
    "/", line 24: type 'mach_port_copy_send_t' not defined
    []
    "/", line 159: type 'mach_port_copy_send_t' not defined
    "/", line 204: type 'char' not defined
    / line 132: 28266 Done cat - /dev/null
    28267 Floating point exception| / -n -list auth.msgids
    make[1]: [auth.msgids] Error 136
    make[1]: Leaving directory `/'
    make: [hurd-install-headers] Error 2
    #v-
    +install-msgids: $(MSGIDS); $(INSTALL_DATA) $^ $(datadir)/msgids

    That line should read (already reported to Alfred)
    #v+
    install-msgids: $(MSGIDS) $(datadir)/msgids; $(INSTALL_DATA) $^
    #v-

    Regards,
    Thomas

    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.4 | | 107 bytes | |

    Will fix accordingly, thank you.
    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.5 | | 1688 bytes | |

    How about the following?

    Index: hurd/ChangeLog
    2005-08-25 Alfred M. Szmidt <ams (AT) gnu (DOT) org>

    * Makefile (MSGIDS): New variable.
    (all, install-msgids, $(datadir)/msgids): New targets.
    (install): Specify install-header and install-msgids as
    prerequisites.

    Index: hurd/Makefile

    RCS file: /,v
    retrieving revision 1.28
    diff -p -u -u -r1.28 Makefile
    hurd/Makefile22 Aug 2002 21:25:04 -00001.28
    hurd/Makefile25 Aug 2005 18:26:08 -0000
    @@ -1,4 +1,4 @@
    -# Copyright (C) 1993,94,95,96,99,2002 Free Software Foundation
    +# Copyright (C) 1993,94,95,96,99,2002,2005 Free Software Foundation
    #
    # This program is free software; you can redistribute it and/or
    # modify it under the terms of the GNU General Public License as
    @@ -22,15 +22,20 @@ DIST_FILES = subsystems $(notdir $(hdrs)

    INSTHDRS = hurd_types.h version.h ioctl_types.h paths.h shared.h console.h \
    $(notdir $(wildcard $(srcdir)/*.defs))
    +MSGIDS := hurd.msgids $(patsubst %.defs,%.msgids,$(filter %.defs,$(INSTHDRS)))

    include /Makeconf
    -install-headers install: $(includedir)/hurd \
    +all: $(MSGIDS)
    +
    +install: install-msgids install-headers
    +install-headers: $(includedir)/hurd \
    $(addprefix $(includedir)/hurd/,$(INSTHDRS))
    +install-msgids: $(MSGIDS) $(datadir)/msgids; $(INSTALL_DATA) $^

    $(includedir)/hurd/%: $(srcdir)/%; $(INSTALL_DATA) $< $@
    -$(includedir)/hurd:;mkdir -p $@
    +$(datadir)/msgids $(includedir)/hurd:;mkdir -p $@

    %.msgids: $(srcdir)/%.defs
    if grep -q '^subsystem' $<; \

    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.6 | | 685 bytes | |

    Thu, Aug 25, 2005 at 09:06:59PM +0200, Alfred M. Szmidt wrote:
    Index: hurd/ChangeLog
    2005-08-25 Alfred M. Szmidt <ams (AT) gnu (DOT) org>

    * Makefile (MSGIDS): New variable.
    (all, install-msgids, $(datadir)/msgids): New targets.
    (install): Specify install-header and install-msgids as
    prerequisites.

    Works as expected. Thanks for fixing the patch.

    Is it worth adding a rule for 'install-msgids' to the top-level
    Makefile?
    Running 'make prefix= install-msgids' in [hurd]/hurd/ works, but
    obviously not in [hurd]/.

    Regards,
    Thomas

    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.7 | | 254 bytes | |

    Is it worth adding a rule for 'install-msgids' to the top-level
    Makefile?
    You can do `make -C hurd install-msgids' from the top-level build
    directory.
    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org
  • No.8 | | 366 bytes | |

    Commited to ams-branch.

    Index: hurd/ChangeLog
    2005-08-25 Alfred M. Szmidt <ams (AT) gnu (DOT) org>

    * Makefile (MSGIDS): New variable.
    (all, install-msgids, $(datadir)/msgids): New targets.
    (install): Specify install-header and install-msgids as
    prerequisites.

    Bug-hurd mailing list
    Bug-hurd (AT) gnu (DOT) org

Re: patch to close task #1017


max 4000 letters.
Your nickname that display:
In order to stop the spam: 6 + 6 =
QUESTION ON "Unix"

EMSDN.COM