[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1063: clean up glibc, fix its install
From: |
Brandon Invergo |
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1063: clean up glibc, fix its install, and prevent locale conflicts |
Date: |
Mon, 05 Nov 2012 23:23:21 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1063
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2012-11-05 23:23:21 +0100
message:
clean up glibc, fix its install, and prevent locale conflicts
added:
gnu/libc/config.mk
modified:
gnu/libc/Makefile
=== modified file 'gnu/libc/Makefile'
--- a/gnu/libc/Makefile 2012-08-25 23:18:52 +0000
+++ b/gnu/libc/Makefile 2012-11-05 22:23:21 +0000
@@ -1,25 +1,26 @@
GARNAME = glibc
GARVERSION = 2.16.0
+HOME_URL = http://www.gnu.org/software/libc/
+DESCRIPTION = The GNU C library
+
+######################################################################
MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = glibc/
-
+MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-
WORKOBJ = $(WORKDIR)/build
-
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKOBJ)/Makefile
TEST_SCRIPTS = $(WORKOBJ)/Makefile
-INSTALL_SCRIPTS = $(WORKOBJ)/Makefile
+INSTALL_SCRIPTS = $(WORKOBJ)/Makefile-DESTDIR
BUILDDEPS = binutils
-# LIBDEPS =
+LIBDEPS =
+
+######################################################################
+
+include ../../gar.lib/auto.mk
+include config.mk
INSTALL_ARGS = inst_vardbdir=$(prefix)/var/db
-
-HOME_URL = http://www.gnu.org/software/libc/
-DESCRIPTION = The GNU C library
-
-include ../../gar.lib/auto.mk
=== added file 'gnu/libc/config.mk'
--- a/gnu/libc/config.mk 1970-01-01 00:00:00 +0000
+++ b/gnu/libc/config.mk 2012-11-05 22:23:21 +0000
@@ -0,0 +1,12 @@
+## Configuration options for libc ##
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
+
+# Installing glibc via GSRC when there is already a system-installed
+# copy causes locale problems when your GSRC directory is added to
+# your PATH. The easiest solution is to just prevent installing them.
+# If you're using GSRC to install programs system-wide and you indend
+# for this to be the main glibc for the system, you may remove this
+# line.
+COLLISIONS += bin/locale bin/localedef sbin/locale-gen
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1063: clean up glibc, fix its install, and prevent locale conflicts,
Brandon Invergo <=