85cc462e1d
* Moved helpers, common and triggers dirs into xbps-src, where they belong. * Renamed the templates dir to srcpkgs, it was so redundant before. * Make it possible to add subpkgs with no restriction in names, for example udev now has a subpkgs called "libgudev". Previously subpkgs were named "${sourcepkg}-${pkgname}". * xbps-src: changed to look for template files in current directory. That means that most arguments from the targets have been removed. * xbps-src: added a reinstall target, to remove + install. * xbps-src: do not overwrite binpkgs by default, skip them. And more that I forgot because it's a mega-commit that I've been working for some days already... --HG-- extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
24 lines
1.0 KiB
Diff
24 lines
1.0 KiB
Diff
--- Makefile.shared.orig 2008-09-17 17:56:40.000000000 +0200
|
|
+++ Makefile.shared 2009-02-04 03:01:45.000000000 +0100
|
|
@@ -105,7 +105,7 @@ LINK_SO= \
|
|
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
|
|
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
|
|
$${SHAREDCMD} $${SHAREDFLAGS} \
|
|
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
|
|
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
|
|
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
|
|
) && $(SYMLINK_SO)
|
|
|
|
@@ -149,9 +149,9 @@ DO_GNU_SO=$(CALC_VERSIONS); \
|
|
SHLIB_SUFFIX=; \
|
|
ALLSYMSFLAGS='-Wl,--whole-archive'; \
|
|
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
|
|
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
|
|
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.7"
|
|
|
|
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
|
|
+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
|
|
|
|
#This is rather special. It's a special target with which one can link
|
|
#applications without bothering with any features that have anything to
|