alignment/blocking - LFS r12.4-37-systemd

[rhubarbpieguy]

I hope the sed modifications show the preferred format.  I'm uncertain about the last ninja line.

chapter08/glibc.html

  sed -e '/unistd.h/i #include <string.h>' \
      -e '/libc_rwlock_init/c\
    __libc_rwlock_define_initialized (, reset_lock);\
    memcpy (&lock, &reset_lock, sizeof (lock));' \

modification?

sed -e '/unistd.h/i #include <string.h>'             \
      -e '/libc_rwlock_init/c                        \
    __libc_rwlock_define_initialized (, reset_lock); \
    memcpy (&lock, &reset_lock, sizeof (lock));'     \

------------------------------------------------------

chapter08/ninja.html

  sed -i '/int Guess/a \
    int   j = 0;\
    char* jobs = getenv( "NINJAJOBS" );\
    if ( jobs != NULL ) j = atoi( jobs );\
    if ( j > 0 ) return j;\

modification?

sed -i '/int Guess/a                      \
    int   j = 0;                          \
    char* jobs = getenv( "NINJAJOBS" );   \
    if ( jobs != NULL ) j = atoi( jobs ); \
    if ( j > 0 ) return j; \

-------------------------------------------


chapter08/sqlite.html

  ./configure --prefix=/usr    \
              --disable-static  \
              --enable-fts{4,5} \
              CPPFLAGS="-D SQLITE_ENABLE_COLUMN_METADATA=1 \
                        -D SQLITE_ENABLE_UNLOCK_NOTIFY=1   \
                        -D SQLITE_ENABLE_DBSTAT_VTAB=1     \

modification

./configure --prefix=/usr     \
            --disable-static  \
            --enable-fts{4,5} \
            CPPFLAGS="-D SQLITE_ENABLE_COLUMN_METADATA=1 \
                      -D SQLITE_ENABLE_UNLOCK_NOTIFY=1   \
                      -D SQLITE_ENABLE_DBSTAT_VTAB=1     \

[Xi Ruoyao]

We don't want extra whitespaces in the sed component that will become a part of the modified file. Doing so will leave trailing whitespaces in the file. For example the modified version of ninja sed leaves 20+ trailing whitespaces after int j = 0;.

[Bruce Dubbs]

I will fix the spacing for sqlite, but not the spacing for the seds.

Note that for the seds the backslashes are part of multi-line append constructs within single quotes.

[Bruce Dubbs]

Fixed at commit f8ab28e0f8.