diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-08-26 22:51:29 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-08-26 22:51:29 +0000 |
commit | 96ed465b2f46a8c7505ee910a1610db71d4804ba (patch) | |
tree | 042e61585c8c7cac4559dfadc6da86621b289743 /dev-libs/libezV24/files | |
parent | More maskings for TC (diff) | |
download | gentoo-2-96ed465b2f46a8c7505ee910a1610db71d4804ba.tar.gz gentoo-2-96ed465b2f46a8c7505ee910a1610db71d4804ba.tar.bz2 gentoo-2-96ed465b2f46a8c7505ee910a1610db71d4804ba.zip |
Cleanup the ebuild and source code so it doesnt suck nearly as much and add some amd64 love.
(Portage version: 2.1.1_rc1)
Diffstat (limited to 'dev-libs/libezV24/files')
-rw-r--r-- | dev-libs/libezV24/files/digest-libezV24-0.1.1 | 2 | ||||
-rw-r--r-- | dev-libs/libezV24/files/libezV24-0.1.1-build.patch | 170 | ||||
-rw-r--r-- | dev-libs/libezV24/files/libezV24-0.1.1-test.patch | 20 |
3 files changed, 192 insertions, 0 deletions
diff --git a/dev-libs/libezV24/files/digest-libezV24-0.1.1 b/dev-libs/libezV24/files/digest-libezV24-0.1.1 index c430d2866d33..5e1dbc813fa6 100644 --- a/dev-libs/libezV24/files/digest-libezV24-0.1.1 +++ b/dev-libs/libezV24/files/digest-libezV24-0.1.1 @@ -1 +1,3 @@ MD5 59a682a6ba5cce142760f7309dea44f9 libezV24-0.1.1.tar.gz 50515 +RMD160 2af0688d37aec8b44d610b5f6f98155e55a10547 libezV24-0.1.1.tar.gz 50515 +SHA256 684afbc6c20515101c879aebd220537defe261ec080c819ebce3aea81182f606 libezV24-0.1.1.tar.gz 50515 diff --git a/dev-libs/libezV24/files/libezV24-0.1.1-build.patch b/dev-libs/libezV24/files/libezV24-0.1.1-build.patch new file mode 100644 index 000000000000..6446ed32f380 --- /dev/null +++ b/dev-libs/libezV24/files/libezV24-0.1.1-build.patch @@ -0,0 +1,170 @@ +--- libezV24-0.1.1/Makefile ++++ libezV24-0.1.1/Makefile +@@ -19,68 +19,62 @@ + # the base name of the library + SOBASE = ezV24 + +-# define the destination OS (currently only linux) +-PLATFORM=__LINUX__ +- + # the base path where the file should be installed to. + PREFIX = /usr/local + ++# an additional prefix for building RPM packages. NOTE: don't forget to add a ++# trailing slash! ++DESTDIR = ++ + # generate the name of the output file in dependence of the development state. + # +-ifeq "${RELEASE}" "DEBUG" ++ifeq ($(RELEASE),DEBUG) + NAME = lib$(SOBASE).so.$(SORELEASE).dbg + else + NAME = lib$(SOBASE).so.$(VERSION) + endif + SONAME = lib$(SOBASE).so.$(SORELEASE) +-LIBNAME = lib$(SOBASE)-$(SORELEASE)_s.a ++LIBNAME = lib$(SOBASE).a + PLAINNAME = lib$(SOBASE).so + + # basename of the project + PROJECTNAME = libezV24-$(VERSION).$(PATCHLEVEL) + +-OBJS = ezV24.o snprintf.o ++STATIC_OBJS = ezV24.o snprintf.o ++SHARED_OBJS = $(patsubst %.o,%.lo,$(STATIC_OBJS)) + LIBS = + +- +-ifeq "${RELEASE}" "DEBUG" +-C_FLAG = -c -Wall -fPIC -D$(PLATFORM) $(INCDIR) +-C_DEFS = -DDEBUG -DBETA +-LFLAGS = $(LIBDIR) ++ifeq ($(RELEASE),DEBUG) ++CPPFLAGS += -DDEBUG -DBETA + else +-ifeq "${RELEASE}" "BETA" +-C_FLAG = -c -Wall -fPIC -O2 -D$(PLATFORM) $(INCDIR) +-C_DEFS = -DBETA +-LFLAGS = $(LIBDIR) ++ifeq ($(RELEASE),BETA) ++CPPFLAGS += -DBETA + else +-C_FLAG = -c -Wall -fPIC -O2 -D$(PLATFORM) $(INCDIR) +-C_DEFS = -DFINAL +-LFLAGS = -s $(LIBDIR) ++CPPFLAGS += -DFINAL + endif + endif + ++CPPFLAGS += -I. ++CFLAGS ?= -O2 ++CFLAGS += -Wall ++LDFLAGS ?= -s ++ + # tools to build the static library + ARFLAGS = cru +-AR = ar +-RANLIB = ranlib +- +-# concatinate the compile flags +-CFLAGS = $(C_FLAG) $(C_DEFS) +- ++AR ?= ar ++RANLIB ?= ranlib + +- +-# ------------------------------------------------------------------------ +-# AUTOMATISCHE COMPILE-ANWEISUNGEN +-# ------------------------------------------------------------------------ +- +-.c.o: +- gcc $(CFLAGS) $< ++# some distros have a messed up path when in su - ++LDCONFIG ?= /sbin/ldconfig + + + # -------------------------------------------------------------------------- + # ANHÄNGIGKEITEN + # -------------------------------------------------------------------------- + ++%.lo: %.c ++ $(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@ ++ + all: shared static test-v24 + + shared: $(NAME) +@@ -88,13 +82,13 @@ + static: $(LIBNAME) + + ++$(NAME): $(SHARED_OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(LDFLAGS) + +-$(NAME): $(OBJS) +- gcc -shared -W1,soname,$(SONAME) -o $(NAME) $(OBJS) ++$(LIBNAME): $(STATIC_OBJS) ++ $(AR) $(ARFLAGS) $@ $^ ++ $(RANLIB) $@ + +-$(LIBNAME): $(OBJS) +- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJS) +- $(RANLIB) $(LIBNAME) + + + # Abhängigkeiten des Source, jedoch dann ohne Generierungsanweisung, wenn +@@ -111,14 +104,17 @@ + # + + install: +- install -d -m 755 $(PREFIX)/include/$(SOBASE)/; +- install -m 644 ezV24.h $(PREFIX)/include/$(SOBASE)/ +- install -m 644 -s $(LIBNAME) $(PREFIX)/lib/$(LIBNAME) +- install -m 755 -s $(NAME) $(PREFIX)/lib/$(NAME) +- rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME) +- ln -s $(PREFIX)/lib/$(NAME) $(PREFIX)/lib/$(SONAME);\ +- ln -s $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME);\ +- ldconfig ++ install -d -m 755 $(DESTDIR)$(PREFIX)/include/ ++ install -d -m 755 $(DESTDIR)$(PREFIX)/lib/ ++ install -m 644 ezV24.h $(DESTDIR)$(PREFIX)/include/ ++ install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib/$(LIBNAME) ++ install -m 755 $(NAME) $(DESTDIR)$(PREFIX)/lib/$(NAME) ++ rm -f $(DESTDIR)$(PREFIX)/lib/$(SONAME) $(DESTDIR)$(PREFIX)/lib/$(PLAINNAME) ++ ln -s $(NAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME) ++ ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(PLAINNAME) ++ if [ -z $$NO_LDCONFIG ]; then \ ++ $(LDCONFIG); \ ++ fi + + uninstall: + rm -f $(PREFIX)/include/ezV24/* +@@ -127,7 +122,9 @@ + rm -f $(PREFIX)/lib/$(LIBNAME) + rm -f $(PREFIX)/lib/$(NAME) + rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME) +- ldconfig ++ if [ -z $$NO_LDCONFIG ]; then \ ++ $(LDCONFIG); \ ++ fi + + + # This entry is for packing a distribution tarball +@@ -158,15 +156,15 @@ + # gcc -o test-v24 -Wall test-v24.c -l$(SOBASE) + # + test-v24: test-v24.c ezV24.h $(LIBNAME) +- gcc -o test-v24 -Wall test-v24.c -L./ $(LIBNAME) ++ $(CC) -o test-v24 -Wall -DUNINSTALLED test-v24.c -L./ $(LIBNAME) + + + # -------------------------------------------------------------------------- + # ANDERE AUFGABEN + # -------------------------------------------------------------------------- + + clean: +- rm -f *.o core ++ rm -f *.o *.lo core + + clean-all: + rm -f *.o core test-v24 $(NAME) $(LIBNAME) diff --git a/dev-libs/libezV24/files/libezV24-0.1.1-test.patch b/dev-libs/libezV24/files/libezV24-0.1.1-test.patch new file mode 100644 index 000000000000..f3c2b676546f --- /dev/null +++ b/dev-libs/libezV24/files/libezV24-0.1.1-test.patch @@ -0,0 +1,20 @@ +Index: test-v24.c +=================================================================== +RCS file: /cvsroot/ezv24/libezv24/test-v24.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -p -r1.2 -r1.3 +--- test-v24.c 11 Feb 2003 13:29:43 -0000 1.2 ++++ test-v24.c 13 Oct 2003 07:50:26 -0000 1.3 +@@ -30,7 +33,11 @@ + #include <string.h> + #include <signal.h> + ++#ifdef UNINSTALLED ++#include "ezV24.h" ++#else + #include <ezV24/ezV24.h> ++#endif + + #define __TEST_V24_C__ + |