[berkeley-abc] 01/01: There was an error in the patch which made it fail on arm architectures :(

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository berkeley-abc.

commit da960dc7abf6f4a6bcf45bfdc80e3d3c8e556b47
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Apr 13 21:54:54 2015 +0200

    There was an error in the patch which made it fail on arm architectures :(
    
    Fixing..
---
 debian/changelog                             |  7 +++++++
 debian/patches/04_memory_alignment_fix.patch | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ee83c4..4e90410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+berkeley-abc (1.01+20141105hg5b5af75+dfsg-3) unstable; urgency=medium
+
+  * debian/patches/04_memory_alignment_fix.patch:
+    - Fixed error in patch..
+
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Mon, 13 Apr 2015 21:56:02 +0200
+
 berkeley-abc (1.01+20141105hg5b5af75+dfsg-2) unstable; urgency=medium
 
   * debian/patches/04_memory_alignment_fix.patch:
diff --git a/debian/patches/04_memory_alignment_fix.patch b/debian/patches/04_memory_alignment_fix.patch
index e1ba8d5..33c77d1 100644
--- a/debian/patches/04_memory_alignment_fix.patch
+++ b/debian/patches/04_memory_alignment_fix.patch
@@ -4,9 +4,9 @@ Author: Clifford Wolf <clifford at clifford.at>
 Forwarded: Came from upstream - therefore no need
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile	2015-02-10 23:23:32.700004407 +0100
-+++ berkeley-abc/Makefile	2015-02-10 23:24:35.040004937 +0100
-@@ -45,6 +45,9 @@
+--- berkeley-abc.orig/Makefile
++++ berkeley-abc/Makefile
+@@ -45,6 +45,9 @@ ARCHFLAGS ?= $(shell $(CC) arch_flags.c
  OPTFLAGS  ?= -g -O #-DABC_NAMESPACE=xxx
  
  CFLAGS   += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
@@ -18,20 +18,20 @@ Index: berkeley-abc/Makefile
  ifneq ($(or $(findstring gcc,$(CC)),$(findstring g++,$(CC))),)
 Index: berkeley-abc/src/aig/aig/aigMem.c
 ===================================================================
---- berkeley-abc.orig/src/aig/aig/aigMem.c	2015-02-10 23:19:40.828002437 +0100
-+++ berkeley-abc/src/aig/aig/aigMem.c	2015-02-10 23:26:39.164005992 +0100
-@@ -161,6 +161,10 @@
- char * Aig_MmFixedEntryFetch( Aig_MmFixed_t * p )
+--- berkeley-abc.orig/src/aig/aig/aigMem.c
++++ berkeley-abc/src/aig/aig/aigMem.c
+@@ -366,6 +366,10 @@ void Aig_MmFlexStop( Aig_MmFlex_t * p, i
+ char * Aig_MmFlexEntryFetch( Aig_MmFlex_t * p, int nBytes )
  {
      char * pTemp;
 +#ifdef ABC_MEMALIGN
 +    // extend size to max alignment
 +    nBytes += (ABC_MEMALIGN - nBytes % ABC_MEMALIGN) % ABC_MEMALIGN;
 +#endif
-     int i;
- 
      // check if there are still free entries
-@@ -535,6 +539,10 @@
+     if ( p->pCurrent == NULL || p->pCurrent + nBytes > p->pEnd )
+     { // need to allocate more entries
+@@ -535,6 +539,10 @@ char * Aig_MmStepEntryFetch( Aig_MmStep_
  {
      if ( nBytes == 0 )
          return NULL;
@@ -42,7 +42,7 @@ Index: berkeley-abc/src/aig/aig/aigMem.c
      if ( nBytes > p->nMapSize )
      {
          if ( p->nChunks == p->nChunksAlloc )
-@@ -564,6 +572,10 @@
+@@ -564,6 +572,10 @@ void Aig_MmStepEntryRecycle( Aig_MmStep_
  {
      if ( nBytes == 0 )
          return;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/berkeley-abc.git