mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-24 02:17:12 -07:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
--- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
|
|
+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
|
|
@@ -127,3 +127,18 @@
|
|
.PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
|
|
|
|
# (end of Makefile)
|
|
+
|
|
+# Use libtool for binary installs, etc.
|
|
+
|
|
+export V
|
|
+export LIBTOOL = ../libtool --quiet --tag=CC
|
|
+# See libtool manual about how to set this
|
|
+
|
|
+gentoo_clean:
|
|
+ cd src; $(MAKE) $@
|
|
+
|
|
+gentoo_install:
|
|
+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
|
|
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
|
|
+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
|
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
|
|
--- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
|
|
+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
|
|
@@ -54,1 +54,1 @@
|
|
-$(LUA_T): $(LUA_O) $(LUA_A)
|
|
+origin$(LUA_T): $(LUA_O) $(LUA_A)
|
|
@@ -57,1 +57,1 @@
|
|
-$(LUAC_T): $(LUAC_O) $(LUA_A)
|
|
+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
|
|
@@ -185,3 +185,30 @@
|
|
lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
|
|
lzio.h
|
|
|
|
+
|
|
+export LIBTOOL = ../libtool --quiet --tag=CC
|
|
+export LIB_VERSION = 6:1:1
|
|
+
|
|
+# The following rules use libtool for compiling and linking in order to
|
|
+# provide shared library support.
|
|
+
|
|
+LIB_NAME = liblua.la
|
|
+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
|
|
+
|
|
+%.lo %.o: %.c
|
|
+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
|
|
+
|
|
+$(LIB_NAME): $(LIB_OBJS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
|
|
+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
|
|
+
|
|
+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
|
|
+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
|
|
+
|
|
+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
|
|
+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
|
|
+
|
|
+gentoo_clean:
|
|
+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
|
|
+
|
|
+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
|