lkml.org 
[lkml]   [2011]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] kbuild: don't use a symlink for update-po-config
    This patch changes update-po-config to not create a symlink in arch/um 
    because this fails with make O= builds.
    It also improves the V=0 output.

    GEN /usr/src/lto/work/Makefile
    GEN config
    ln: failed to create symbolic link `arch/um/Kconfig': No such file or directory
    make[3]: *** [update-po-config] Error 1
    make[2]: *** [update-po-config] Error 2
    make[1]: *** [sub-make] Error 2
    make: *** [all] Error 2

    Signed-off-by: Peter Foley <pefoley2@verizon.net>
    ---
    scripts/kconfig/Makefile | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
    index 82d2eb2..1d99a08 100644
    --- a/scripts/kconfig/Makefile
    +++ b/scripts/kconfig/Makefile
    @@ -74,9 +74,8 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf

    # Create new linux.pot file
    # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
    -# The symlink is used to repair a deficiency in arch/um
    update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
    - $(Q)echo " GEN config"
    + $(Q)echo " GEN config.pot"
    $(Q)xgettext --default-domain=linux \
    --add-comments --keyword=_ --keyword=N_ \
    --from-code=UTF-8 \
    @@ -84,16 +83,16 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
    --directory=$(srctree) --directory=$(objtree) \
    --output $(obj)/config.pot
    $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
    - $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
    - $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`; \
    + $(Q)(for i in `ls $(srctree)/arch/*/Kconfig` \
    + $(srctree)/arch/um/Kconfig.x86; \
    do \
    - echo " GEN $$i"; \
    + echo " GEN $$i"; \
    $(obj)/kxgettext $$i \
    >> $(obj)/config.pot; \
    done )
    + $(Q)echo " GEN linux.pot"
    $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
    --output $(obj)/linux.pot
    - $(Q)rm -f $(srctree)/arch/um/Kconfig
    $(Q)rm -f $(obj)/config.pot

    PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
    --
    1.7.7


    \
     
     \ /
      Last update: 2011-10-22 18:25    [W:0.025 / U:31.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site