diff options
| author | Roy Marples <roy@marples.name> | 2008-01-04 11:06:58 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-04 11:06:58 +0000 |
| commit | d7961bef66619849e14fe8be38f1880d0473a2a7 (patch) | |
| tree | e67114e7eda4907ff1380e5e0fe1440457765a27 | |
| parent | d8019881dd588cef273f506411ec23a888c646e5 (diff) | |
| download | openrc-d7961bef66619849e14fe8be38f1880d0473a2a7.tar.gz openrc-d7961bef66619849e14fe8be38f1880d0473a2a7.tar.bz2 openrc-d7961bef66619849e14fe8be38f1880d0473a2a7.tar.xz | |
Add BIN_LDFLAGS so that we can build static bins without affecting our shared libraries.
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/libeinfo.c | 4 | ||||
| -rw-r--r-- | src/librc.c | 4 | ||||
| -rw-r--r-- | src/rc.c | 4 |
5 files changed, 10 insertions, 8 deletions
@@ -8,6 +8,7 @@ Yup, that simple. Works with GNU make, FreeBSD make and pmake. Should work with every other make too. You may wish to tweak the installation with the below arguments +BIN_LDFLAGS=-static LIB=lib64 DESTDIR=/tmp/openrc-image PAM=pam diff --git a/src/Makefile b/src/Makefile index 01ecf9b..c24e75e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -# Copyright 2007 Roy Marples +# Copyright 2007-2008 Roy Marples # We should strive to keep this Makefile working with the default make # shipped with the OS's we support. Mainly because I'm lazy and just want @@ -129,7 +129,8 @@ $(LIBRCSO): rc.map $(LIBRCOBJS) $(RCOBJS): $(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $< rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS) - $(CC) $(LDFLAGS) -o rc $(RCOBJS) $(LDLIBS) $(LDLIBS_RC) $(LDLIBS_LIBEINFO) $(LDLIBS_LIBRC) + $(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc \ + $(RCOBJS) $(LDLIBS) $(LDLIBS_RC) $(LDLIBS_LIBEINFO) $(LDLIBS_LIBRC) $(ALL_LINKS): rc ln -sf rc $@ diff --git a/src/libeinfo.c b/src/libeinfo.c index c590486..d80af9c 100644 --- a/src/libeinfo.c +++ b/src/libeinfo.c @@ -4,7 +4,7 @@ */ /* - * Copyright 2007 Roy Marples + * Copyright 2007-2008 Roy Marples * All rights reserved * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -const char libeinfo_copyright[] = "Copyright (c) 2007 Roy Marples"; +const char libeinfo_copyright[] = "Copyright (c) 2007-2008 Roy Marples"; #include <sys/types.h> #include <sys/ioctl.h> diff --git a/src/librc.c b/src/librc.c index 8e0a62c..15309f8 100644 --- a/src/librc.c +++ b/src/librc.c @@ -4,7 +4,7 @@ */ /* - * Copyright 2007 Roy Marples + * Copyright 2007-2008 Roy Marples * All rights reserved * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -const char librc_copyright[] = "Copyright (c) 2007 Roy Marples"; +const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples"; #include "librc.h" @@ -9,7 +9,7 @@ */ /* - * Copyright 2007 Roy Marples + * Copyright 2007-2008 Roy Marples * All rights reserved * Redistribution and use in source and binary forms, with or without @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -const char rc_copyright[] = "Copyright (c) 2007 Roy Marples"; +const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples"; #define SYSLOG_NAMES |