diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /matrixssl | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'matrixssl')
| -rw-r--r-- | matrixssl/matrixssl-1.0-beta/cross.patch | 28 | ||||
| -rw-r--r-- | matrixssl/matrixssl-1.1.1/cross.patch | 55 | ||||
| -rw-r--r-- | matrixssl/matrixssl_1.0-beta.bb | 0 | ||||
| -rw-r--r-- | matrixssl/matrixssl_1.1.1.bb | 0 |
4 files changed, 0 insertions, 83 deletions
diff --git a/matrixssl/matrixssl-1.0-beta/cross.patch b/matrixssl/matrixssl-1.0-beta/cross.patch deleted file mode 100644 index b4c9634949..0000000000 --- a/matrixssl/matrixssl-1.0-beta/cross.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- src/Makefile~cross 2004-03-01 19:12:37.000000000 -0500 -+++ src/Makefile 2004-06-04 21:59:55.527364588 -0400 -@@ -12,14 +12,14 @@ - # - # Debug flags and C flags - # --DFLAGS = -O3 -+CFLAGS = -O3 - # - # To build a debug version of the MatrixSSL library, uncomment the DFLAGS line - # below and remove the strip command in the .so target below. - # --#DFLAGS = -g -DDEBUG -+#CFLAGS = -g -DDEBUG - --CFLAGS = -DLINUX $(DFLAGS) -+override CFLAGS += -DLINUX - LDFLAGS = -Wl -lc -lpthread - - all: compile -@@ -56,7 +56,6 @@ - # - libmatrixssl.so: $(OBJECTS) - $(CC) -shared -nostdlib -o $@ $^ $(LDFLAGS) -- strip $(LIBRARIES) - - # - # Clean up workspace diff --git a/matrixssl/matrixssl-1.1.1/cross.patch b/matrixssl/matrixssl-1.1.1/cross.patch deleted file mode 100644 index 05ae0523e8..0000000000 --- a/matrixssl/matrixssl-1.1.1/cross.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- src/Makefile.porig 2004-06-10 15:03:25.000000000 -0400 -+++ src/Makefile 2004-06-11 20:16:30.701134886 -0400 -@@ -6,7 +6,7 @@ - # - - CC = gcc --STRIP = strip -+STRIP = -s - O = .o - SO = .so - E = -@@ -37,17 +37,17 @@ - # - ifdef MATRIXSSL_DEBUG - DFLAGS = -g -Wall -DDEBUG --STRIP = test -+STRIP = - else --DFLAGS = -O3 -+DFLAGS = -O2 - endif - - # - # Compile options - # --SHARED = -shared --CFLAGS = $(DFLAGS) -DLINUX --LDFLAGS = -nostdlib -lc -lpthread -+SHARED = -shared -+CFLAGS = $(DFLAGS) $(STRIP) -DLINUX -+LDLIBS = -nostdlib -lc -lpthread - - # - # Override variables for compilation on Mac OS X (Darwin) -@@ -57,8 +57,8 @@ - SO = .dylib - SHARED = -dynamiclib - CFLAGS += -DOSX -isystem -I/usr/include --LDFLAGS = -flat_namespace -install_name @executable_path/../src/$(LIBRARY) --STRIP = test -+LDLIBS = -flat_namespace -install_name @executable_path/../src/$(LIBRARY) -+STRIP = - endif - - all: compile -@@ -77,8 +77,7 @@ - # Build the library - # - $(LIBRARY): $(OBJECTS) -- $(CC) $(SHARED) -o $@ $^ $(LDFLAGS) -- $(STRIP) $(LIBRARY) -+ $(CC) $(SHARED) -o $@ $^ $(LDFLAGS) $(LDLIBS) - - # - # Clean up all generated files diff --git a/matrixssl/matrixssl_1.0-beta.bb b/matrixssl/matrixssl_1.0-beta.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/matrixssl/matrixssl_1.0-beta.bb +++ /dev/null diff --git a/matrixssl/matrixssl_1.1.1.bb b/matrixssl/matrixssl_1.1.1.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/matrixssl/matrixssl_1.1.1.bb +++ /dev/null |